Merge branch 'staging'

.gitlab-ci.yml

@@ -65,12 +65,6 @@ discover-submodules:
   dependencies:
     - discover-submodules
 
-wait-api-image:
-  <<: *docker_wait_submodule_img_template
-  before_script:
-    - REPO=mistio/mist.api
-    - IMG=mist
-
 wait-ui-image:
   <<: *docker_wait_submodule_img_template
   before_script:
@@ -90,6 +84,46 @@ wait-tests-image:
     - IMG=tests_base
 
 
+# Rebuild api image.
+
+rebuild-api-image:
+  stage: build
+  variables:
+    NUM: "60"
+    SLEEP: "10"
+    REPO: mistio/mist.api
+    IMG: mist
+  script:
+    - SUBMODULE_SHA=$(grep ^$REPO, all-submodules.csv | cut -d, -f2)
+    - echo SUBMODULE_SHA is $SUBMODULE_SHA
+    - GCR_IMG="gcr.io/mist-ops/$IMG"
+    - DOCKERHUB_IMG="mist/$IMG"
+    - IMGTAG="$GCR_IMG:$SUBMODULE_SHA"
+    - echo IMTAG is $IMGTAG
+
+    - echo "Will pull docker image $IMGTAG"
+    - for i in $(seq 1 $NUM); do docker pull $IMGTAG && OK=1 && break || sleep $SLEEP; done
+    - if [ -z "$OK" ]; then echo "ERROR Couldn't pull $IMGTAG!" && exit 1; fi
+
+    - echo "Will rebuild api image"
+    - sed -i "s~^FROM.*~FROM $IMGTAG~" docker/mist/Dockerfile
+    - docker build -t $IMG/io-$CI_COMMIT_SHA docker/mist
+
+    - |
+        for img_name in $GCR_IMG $DOCKERHUB_IMG; do
+          for ref in $CI_COMMIT_SHA $CI_COMMIT_REF_SLUG; do
+            IMGTAG2=$img_name:io-$ref
+            echo "Will tag and push $IMGTAG2"
+            docker tag $IMG/io-$CI_COMMIT_SHA $IMGTAG2
+            docker push $IMGTAG2
+          done
+        done
+  tags:
+    - shell-docker-light
+  dependencies:
+    - discover-submodules
+
+
 # Build secondary images needed for deploying. Tag with SHA and branch name.
 
 .docker_build_img_template: &docker_build_img_template

docker-compose.override.yml

@@ -39,6 +39,7 @@ services:
       - ./elasticsearch:/elasticsearch
   scheduler: *backend
   poller: *backend
+  beat: *backend
   hubshell: *backend
   api: *backend
   sockjs: *backend

docker-compose.yml

@@ -86,6 +86,10 @@ services:
     <<: *backend
     command: bin/wait-all bin/poller
 
+  beat:
+    <<: *backend
+    command: bin/wait-all bin/beat
+
   hubshell:
     <<: *backend
     command: bin/wait-all bin/hubshell

docker/mist/Dockerfile

@@ -0,0 +1,15 @@
+FROM mist/mist:io-staging
+
+ARG VERSION_REPO=mistio/mist.io
+ARG VERSION_SHA
+ARG VERSION_NAME
+
+# Variables defined solely by ARG are accessible as environmental variables
+# during build but not during runtime. To persist these in the image, they're
+# redefined as ENV in addition to ARG.
+ENV VERSION_REPO=$VERSION_REPO \
+    VERSION_SHA=$VERSION_SHA \
+    VERSION_NAME=VERSION_NAME
+
+RUN echo "{\"sha\":\"$VERSION_SHA\",\"name\":\"$VERSION_NAME\",\"repo\":\"$VERSION_REPO\",\"modified\":false}" \
+        > /mist-version.json