Test

.env

@@ -0,0 +1,2 @@
+TZ=America/Toronto
+SERVER_HOST=localhost

Makefile

@@ -53,14 +53,6 @@ test_prod: pull_prod
 	# different tag.
 	docker compose -f test-prod-compose.yml up
 
-build_arm:
-	@docker build -f ./nginx/Dockerfile.arm --no-cache --tag nginx-local --build-arg VERSION=${DOCKER_TAG} nginx
-
-run_arm:
-	# Run build_arm first if you don't have the NGINX container.
-	# Launch ARM instance 
-	@DOCKER_TAG=$(DOCKER_TAG) docker compose -f arm-compose.yml up
-
 run_client:
 	# Run Rodan-Client for dev (needs local dev up and running)
 	@docker run -p 8080:9002 -v `pwd`/rodan-client/code:/code ddmal/rodan-client:nightly bash
@@ -84,7 +76,6 @@ copy_docker_tag:
 	@docker image tag $(docker images ddmal/rodan-gpu-celery:nightly -q) ddmal/rodan-gpu-celery:$(tag)
 
 pull_prod:
-	docker pull ddmal/hpc-rabbitmq:$(PROD_TAG)
 	docker pull ddmal/iipsrv:nightly
 	docker pull ddmal/nginx:$(PROD_TAG)
 	docker pull ddmal/postgres-plpython:$(PROD_TAG)
@@ -180,7 +171,6 @@ scale:
 	@docker service scale rodan_redis=$(num)
 	# @docker service scale rodan_postgres=$(num)
 	@docker service scale rodan_rabbitmq=$(num)
-	@docker service scale rodan_hpc-rabbitmq=$(num)
 
 health:
 	@docker inspect --format "{{json .State.Health }}" $(log) | jq

build.yml

@@ -49,8 +49,8 @@ services:
       dockerfile: Dockerfile
     image: "ddmal/rodan-client:nightly"
 
-  hpc-rabbitmq:
+  iipsrv:
     build:
-      context: ./hpc-rabbitmq
+      context: ./iipsrv
       dockerfile: Dockerfile
-    image: "ddmal/hpc-rabbitmq:nightly"
+    image: "ddmal/iipsrv:nightly"

docker-compose.yml

@@ -9,6 +9,9 @@ services:
       - rabbitmq
       - redis
       - rodan-main
+    environment:
+      TZ: America/Toronto
+      SERVER_HOST: localhost
     ports:
       - "80:80"
       - "443:443"
@@ -19,13 +22,19 @@ services:
   rodan-main:
     image: "ddmal/rodan-main:${DOCKER_TAG}"
     healthcheck:
-      test: ["CMD-SHELL", "/usr/bin/curl -H 'User-Agent: docker-healthcheck' http://localhost:8000/api/?format=json || exit 1"]
+      test:
+        [
+          "CMD-SHELL",
+          "/usr/bin/curl -H 'User-Agent: docker-healthcheck' http://localhost:8000/api/?format=json || exit 1"
+        ]
       interval: "10s"
       timeout: "5s"
       retries: 2
       start_period: "2m"
     command: bash -c "tail -f /dev/null"
     environment:
+      TZ: America/Toronto
+      SERVER_HOST: localhost
       CELERY_JOB_QUEUE: None
     depends_on:
       - postgres
@@ -38,18 +47,38 @@ services:
       - "resources:/rodan/data"
       - "./rodan-main/code:/code/Rodan"
 
+  rodan-client:
+    image: "ddmal/rodan-client:${DOCKER_TAG}"
+    volumes:
+      - "./rodan-client/code:/code"
+      - "./rodan-client/config/configuration.json:/client/configuration.json"
+
   iipsrv:
-    image: "ddmal/iipsrv:nightly"
+    image: "ddmal/iipsrv:${DOCKER_TAG}"
     volumes:
       - "resources:/rodan/data"
 
   celery:
     image: "ddmal/rodan-main:${DOCKER_TAG}"
     command: bash -c "tail -f /dev/null"
     environment:
+      TZ: America/Toronto
+      SERVER_HOST: localhost
       CELERY_JOB_QUEUE: celery
     healthcheck:
-      test: ["CMD", "celery", "inspect", "ping", "-A", "rodan", "--workdir", "/code/Rodan", "-d", "celery@celery"]
+      test:
+        [
+          "CMD",
+          "celery",
+          "inspect",
+          "ping",
+          "-A",
+          "rodan",
+          "--workdir",
+          "/code/Rodan",
+          "-d",
+          "celery@celery"
+        ]
       interval: "30s"
       timeout: "3s"
       start_period: "1m"
@@ -69,6 +98,8 @@ services:
     image: "ddmal/rodan-python3-celery:${DOCKER_TAG}"
     command: bash -c "tail -f /dev/null"
     environment:
+      TZ: America/Toronto
+      SERVER_HOST: localhost
       CELERY_JOB_QUEUE: Python3
     depends_on:
       - postgres
@@ -78,7 +109,6 @@ services:
       - celery
     env_file:
       - ./scripts/local.env
-      - ./hpc-rabbitmq/scripts/local.env
     volumes:
       - "resources:/rodan/data"
       - "./rodan-main/code:/code/Rodan"
@@ -87,6 +117,8 @@ services:
     image: "ddmal/rodan-gpu-celery:${DOCKER_TAG}"
     command: bash -c "tail -f /dev/null"
     environment:
+      TZ: America/Toronto
+      SERVER_HOST: localhost
       CELERY_JOB_QUEUE: GPU
     depends_on:
       - postgres
@@ -103,7 +135,7 @@ services:
   redis:
     image: "redis:alpine"
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: [ "CMD", "redis-cli", "ping" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -113,7 +145,7 @@ services:
   postgres:
     image: "ddmal/postgres-plpython:${DOCKER_TAG}"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-U", "postgres"]
+      test: [ "CMD-SHELL", "pg_isready", "-U", "postgres" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -123,7 +155,7 @@ services:
   rabbitmq:
     image: "rabbitmq:alpine"
     healthcheck:
-      test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"]
+      test: [ "CMD", "rabbitmq-diagnostics", "-q", "ping" ]
       interval: "30s"
       timeout: "3s"
       retries: 3
@@ -132,17 +164,5 @@ services:
     env_file:
       - ./scripts/local.env
 
-  hpc-rabbitmq:
-    image: "ddmal/hpc-rabbitmq:${DOCKER_TAG}"
-    healthcheck:
-      test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"]
-      interval: "30s"
-      timeout: "3s"
-      retries: 3
-    env_file:
-      - ./hpc-rabbitmq/scripts/local.env
-    ports:
-      - "5672:5672"
-
 volumes:
   resources:

hooks/build

@@ -2,13 +2,6 @@
 # hooks/build
 # https://docs.docker.com/docker-cloud/builds/advanced/
 
-# This "useless" image is build to prevent dockerhub from overwriting
-# the nightly image with it's obligatory minimum of a build rule. If we want a build
-# trigger with a HTTPS POST request, we must have at least 1 build rule.
-docker build \
-  --tag ddmal/rodan:placeholder \
-  .
-
 # RODAN_TAG=`cd rodan-main/code && git describe --tags --always`
 # RODAN_CLIENT_TAG=`cd rodan-client/code && git describe --tags --always`
 # RODAN_DOCKER_TAG=`git describe --tags --always`
@@ -29,6 +22,26 @@ echo "[+] Building images with tag: $DOCKER_TAG"
 
 set -o errexit
 
+# Fail building images
+# Push to trigger webhook and send a message to slack
+trap 'cleanup $?' EXIT
+cleanup() {
+  if [ "$1" != "0" ]; then
+    echo "An error occurs when building images."
+    echo "Push to another repo to trigger webhook on failure with tag syntax: {repo name}-{build status}-{source branch}-{docker tag}"
+
+    docker tag ddmal/docker-webhook:placeholder ddmal/docker-webhook:rodan-fail-${SOURCE_BRANCH}-${DOCKER_TAG}
+    docker push ddmal/docker-webhook:rodan-fail-${SOURCE_BRANCH}-${DOCKER_TAG}
+  fi
+}
+
+# This "useless" image is build to prevent dockerhub from overwriting
+# the nightly image with it's obligatory minimum of a build rule. If we want a build
+# trigger with a HTTPS POST request, we must have at least 1 build rule.
+docker build \
+  --tag ddmal/docker-webhook:placeholder \
+  .
+
 ###############################################################################
 # Stage 1
 #   Build and push Python3-Celery image
@@ -110,12 +123,12 @@ docker build \
   --tag ddmal/nginx:${DOCKER_TAG} \
   ./nginx
 
-echo "[+] Building HPC-RabbitMQ"
+echo "[+] Building iipsrv"
 
 docker build \
   --no-cache \
   --build-arg VERSION=${DOCKER_TAG} \
-  --tag ddmal/hpc-rabbitmq:${DOCKER_TAG} \
-  ./hpc-rabbitmq
+  --tag ddmal/iipsrv:${DOCKER_TAG} \
+  ./iipsrv
 
 echo "[+] Finished"

hooks/post_build

@@ -0,0 +1,20 @@
+#!/bin/bash
+# hooks/post_build
+
+source ./hooks/helper.sh
+if [[ ret_code -eq 1 ]]; then
+  echo "[-] no branch detected, fallback to use docker tag=$DOCKER_TAG"
+  echo "[-] Stop building due to wrong tag: $DOCKER_TAG"
+  exit 1
+elif [[ ret_code -eq 2 ]]; then
+  echo "[-] no tag on release branch, fallback to use docker tag=$DOCKER_TAG"
+  echo "[-] Stop building due to wrong tag: $DOCKER_TAG"
+  exit 1
+fi
+
+# Pass testing a pull request
+# Push to trigger webhook and send a message to slack
+if [[ "$DOCKER_TAG" ==  "this" ]]; then
+  docker tag ddmal/docker-webhook:placeholder ddmal/docker-webhook:rodan-pass-${SOURCE_BRANCH}-${DOCKER_TAG}
+  docker push ddmal/docker-webhook:rodan-pass-${SOURCE_BRANCH}-${DOCKER_TAG}
+fi