Merge branch 'develop' into del_readmes

.env

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

.github/workflows/release-bot.yml

@@ -0,0 +1,68 @@
+name: Create Release checklist
+on:
+  pull_request:
+    branches:
+      - "master"
+
+jobs:
+  release-checklist:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Create output folder
+        run: mkdir -p ${{ github.workspace }}/checklist_items
+      - name: Write checklist items to files
+        id: merge_commits
+        run: |
+          git fetch origin master
+          git fetch origin ${GITHUB_HEAD_REF}
+          MERGE_COMMITS=$(git --no-pager log origin/${GITHUB_HEAD_REF} ^origin/master --oneline --merges --grep "Merge pull request" --pretty=format:"%h")
+
+          for COMMIT in $MERGE_COMMITS; do
+            # Merge commit title
+            checkitem_title=$(git --no-pager show $COMMIT --pretty=format:"%s" | head -n 1 | sed 's/Merge\ pull\ request\ //' | sed 's/from.*\///')
+            # Commits inside this pull request
+            details=$(git --no-pager log  $COMMIT^1..$COMMIT^2 --oneline | sed 's/[a-f0-9]*\ /- /')
+
+            content="- [ ] ${checkitem_title}
+          <details><summary> details </summary>
+
+          \`\`\`
+          ${details}
+          \`\`\`
+          </details>
+          "
+            echo "$content" > checklist_items/$COMMIT.log
+          done
+
+      - name: Collect checklist items
+        run: |
+          msg=$(awk 'FNR==1 && NR!=1 {print "---"}{print}' checklist_items/*.log)
+          echo "$msg" >> aggregated.log
+          sha="*SHA: ${{ github.event.pull_request.head.sha }}*"
+          sed -i "1i\\
+          $sha
+          " aggregated.log
+
+      - name: Update Pull Request
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const fs = require('fs');
+
+            fs.readFile('aggregated.log', 'utf8', (err, data) => {
+              if (err) {
+                console.error(err);
+              } else {
+                const output = data;
+
+                github.rest.issues.createComment({
+                  issue_number: context.issue.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body: output
+                })
+              }
+            });

Makefile

@@ -11,7 +11,7 @@ REPLACE := perl -i -pe
 RODAN_PATH := ./rodan-main/code/rodan
 JOBS_PATH := $(RODAN_PATH)/jobs
 
-PROD_TAG := v2.0.14
+PROD_TAG := v3.0.0
 
 DOCKER_TAG := nightly
 
@@ -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
@@ -230,7 +220,7 @@ push:
 
 pull:
 	@echo "[-] Pulling docker images from Docker Hub..."
-	@docker compose pull
+	@DOCKER_TAG=$(DOCKER_TAG) docker compose pull
 	@echo "[+] Done."
 
 $(JOBS_PATH)/neon_wrapper/Neon/package.json:

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: