fix: Fix agora-mongo:prepare (Sage-Bionetworks#2103)

* Create agora space in docker/ * Fix docker * One more improvement
mdsage1 · Sep 8, 2023 · a2e9eef · a2e9eef
1 parent 884bce4
commit a2e9eef
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 39 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -69,6 +69,7 @@
     3306,
     4200,
     4211,
+    5017,
     5200,
     5432,
     5601,
@@ -120,8 +121,12 @@
       "label": "openchallenges-postgres",
       "onAutoForward": "silent"
     },
+    "5017": {
+      "label": "agora-mongo",
+      "onAutoForward": "silent"
+    },
     "5200": {
-      "label": "agora-webapp",
+      "label": "agora-web-app",
       "onAutoForward": "silent"
     },
     "5601": {

diff --git a/apps/agora/mongo/.env.example b/apps/agora/mongo/.env.example
@@ -1,3 +1,3 @@
 MONGO_INITDB_ROOT_USERNAME=root
 MONGO_INITDB_ROOT_PASSWORD=changeme
-MONGO_INITDB_DATABASE=challenge
+MONGO_INITDB_DATABASE=agora
diff --git a/apps/agora/mongo/docker-compose.yml b/apps/agora/mongo/docker-compose.yml
diff --git a/apps/agora/mongo/project.json b/apps/agora/mongo/project.json
@@ -3,31 +3,65 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/agora/mongo/src",
   "projectType": "application",
+  "tags": ["type:db", "scope:backend"],
   "targets": {
-    "prepare": {
+    "create-config": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "shx cp -n .env.example .env",
-        "cwd": "apps/agora/mongo"
+        "command": "cp -n .env.example .env",
+        "cwd": "{projectRoot}"
       }
     },
-    "serve": {
+    "serve-detach": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "docker compose up",
-        "cwd": "apps/agora/mongo"
-      },
-      "dependsOn": []
+        "command": "docker/agora/serve-detach.sh {projectName}"
+      }
     },
     "build-image": {
       "executor": "@nx-tools/nx-container:build",
       "options": {
         "context": "apps/agora/mongo",
-        "push": false,
-        "tags": ["ghcr.io/sage-bionetworks/agora-mongo:local"]
+        "metadata": {
+          "images": ["ghcr.io/sage-bionetworks/{projectName}"],
+          "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"]
+        },
+        "push": false
+      }
+    },
+    "publish-image": {
+      "executor": "@nx-tools/nx-container:build",
+      "options": {
+        "context": "apps/agora/mongo",
+        "metadata": {
+          "images": ["ghcr.io/sage-bionetworks/{projectName}"],
+          "tags": ["type=edge,branch=main", "type=sha"]
+        },
+        "push": true
+      },
+      "dependsOn": ["build-image"]
+    },
+    "publish-and-remove-image": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "docker rmi $(docker images --filter=reference=ghcr.io/sage-bionetworks/{projectName}:* --quiet) --force"
+      },
+      "dependsOn": ["publish-image"]
+    },
+    "build-and-remove-image": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "docker rmi $(docker images --filter=reference=ghcr.io/sage-bionetworks/{projectName}:* --quiet) --force"
+      },
+      "dependsOn": ["build-image"]
+    },
+    "scan-image": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "trivy image ghcr.io/sage-bionetworks/{projectName}:local --quiet",
+        "color": true
       }
     }
   },
-  "tags": ["type:db", "scope:backend"],
   "implicitDependencies": []
 }
diff --git a/apps/agora/webapp/project.json b/apps/agora/webapp/project.json
@@ -4,7 +4,7 @@
   "projectType": "application",
   "prefix": "sagebionetworks",
   "sourceRoot": "apps/agora/webapp/src",
-  "tags": [],
+  "tags": ["language:typescript"],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",

diff --git a/apps/openchallenges/mariadb/project.json b/apps/openchallenges/mariadb/project.json
@@ -14,8 +14,7 @@
       "executor": "nx:run-commands",
       "options": {
         "command": "docker/openchallenges/serve-detach.sh openchallenges-mariadb"
-      },
-      "dependsOn": []
+      }
     },
     "build-image": {
       "executor": "@nx-tools/nx-container:build",

diff --git a/docker/agora/networks.yml b/docker/agora/networks.yml
@@ -0,0 +1,6 @@
+version: '3.8'
+
+networks:
+  agora:
+    name: agora
+    driver: bridge
diff --git a/docker/agora/serve-detach.sh b/docker/agora/serve-detach.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+args=(
+  # List of services in alphanumeric order
+  --file docker/agora/services/mongo.yml
+  # --file docker/agora/services/web-app.yml
+
+  --file docker/agora/networks.yml
+  --file docker/agora/volumes.yml
+
+  up $1 --detach --remove-orphans
+)
+
+docker compose "${args[@]}"
diff --git a/docker/agora/services/mongo.yml b/docker/agora/services/mongo.yml
@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  agora-mongo:
+    image: ghcr.io/sage-bionetworks/agora-mongo:${AGORA_VERSION:-local}
+    container_name: agora-mongo
+    restart: always
+    env_file:
+      - ../../../apps/agora/mongo/.env
+    volumes:
+      - agora-mongo-data:/data/db
+    networks:
+      - agora
+    ports:
+      - '5017:27017'
+    deploy:
+      resources:
+        limits:
+          memory: 500M
diff --git a/docker/agora/services/web-app.yml b/docker/agora/services/web-app.yml
@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  agora-web-app:
+    image: ghcr.io/sage-bionetworks/agora-web-app:${AGORA_VERSION:-local}
+    container_name: agora-web-app
+    restart: always
+    networks:
+      - agora
+    ports:
+      - '5200:5200'
+    env_file:
+      - ../../../apps/agora/web-app/.env
+    deploy:
+      resources:
+        limits:
+          memory: 200M
+    depends_on:
+      agora-mongo:
+        condition: service_started
diff --git a/docker/agora/volumes.yml b/docker/agora/volumes.yml
@@ -0,0 +1,5 @@
+version: '3.8'
+
+volumes:
+  agora-mongo-data:
+    name: agora-mongo-data