Merge branch 'main' into sage-monorepo/create-node-lambda-template

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Sage Dev Container",
-  "image": "ghcr.io/sage-bionetworks/sage-devcontainer:fb4a44a",
+  "image": "ghcr.io/sage-bionetworks/sage-devcontainer:fab0893",
   "containerEnv": {
     "NX_BASE": "${localEnv:NX_BASE}",
     "NX_BRANCH": "${localEnv:NX_BRANCH}",

apps/openchallenges/apex/Caddyfile

@@ -0,0 +1,31 @@
+{
+  debug
+}
+
+:80 {
+  handle_path /api-docs* {
+    reverse_proxy {env.API_DOCS_HOST}:{env.API_DOCS_PORT}
+  }
+
+  handle_path /api* {
+    reverse_proxy {env.API_GATEWAY_HOST}:{env.API_GATEWAY_PORT}
+  }
+
+  handle_path /health {
+    respond `{"status":"healthy"}` 200
+    header Content-Type application/json
+  }
+
+  handle_path /img* {
+    reverse_proxy {env.THUMBOR_HOST}:{env.THUMBOR_PORT}
+  }
+
+  handle_path /zipkin* {
+    rewrite * /zipkin{uri}
+    reverse_proxy {env.ZIPKIN_HOST}:{env.ZIPKIN_PORT}
+  }
+
+  handle {
+    reverse_proxy {env.APP_HOST}:{env.APP_PORT}
+  }
+}

apps/openchallenges/apex/Dockerfile

@@ -1,13 +1,8 @@
-FROM nginx:1.25.1-alpine
+FROM caddy:2.8.4
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache curl jq
 
 HEALTHCHECK --interval=2s --timeout=3s --retries=20 --start-period=5s \
-  CMD curl --fail --silent "localhost:8000/health" | jq '.status' | grep UP || exit 1
+  CMD curl --fail --silent "localhost:80/health" | jq '.status' | grep healthy || exit 1
 
-COPY templates /etc/nginx/templates/
-COPY nginx.conf /etc/nginx/
-
-EXPOSE 8000
-
-CMD ["nginx", "-g", "daemon off;"]
+COPY Caddyfile /etc/caddy/

apps/openchallenges/apex/project.json

@@ -1,7 +1,6 @@
 {
   "name": "openchallenges-apex",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/openchallenges-apex/src",
   "projectType": "application",
   "targets": {
     "create-config": {
@@ -14,17 +13,16 @@
     "serve-detach": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "docker/openchallenges/serve-detach.sh openchallenges-apex"
+        "command": "docker/openchallenges/serve-detach.sh {projectName}"
       }
     },
     "scan-image": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "trivy image ghcr.io/sage-bionetworks/openchallenges-apex:local --quiet",
+        "command": "trivy image ghcr.io/sage-bionetworks/{projectName}:local --quiet",
         "color": true
       }
     }
   },
-  "tags": ["type:service", "scope:backend"],
-  "implicitDependencies": []
+  "tags": ["type:service", "scope:backend"]
 }

docker/openchallenges/services/apex.yml

@@ -5,13 +5,12 @@ services:
     restart: always
     env_file:
       - ../../../apps/openchallenges/apex/.env
-    # volumes:
-    #   - ../../../apps/openchallenges/apex/nginx.conf:/etc/nginx/nginx.conf
-    #   - ../../../apps/openchallenges/apex/templates:/etc/nginx/templates
+    volumes:
+      - ../../../apps/openchallenges/apex/Caddyfile:/etc/caddy/Caddyfile
     networks:
       - openchallenges
     ports:
-      - '8000:8000'
+      - '8000:80'
     depends_on:
       openchallenges-api-docs:
         condition: service_healthy
@@ -21,7 +20,6 @@ services:
         condition: service_started
       openchallenges-zipkin:
         condition: service_healthy
-
     deploy:
       resources:
         limits:

tools/devcontainers/sage/.devcontainer/Dockerfile

@@ -117,6 +117,13 @@ RUN curl -fsSL https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscl
   && dpkg -i /tmp/session-manager-plugin.deb \
   && rm -fr /tmp/session-manager-plugin.deb
 
+# Install AWS SAM CLI
+RUN curl -Lo aws-sam-cli-linux-x86_64.zip https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
+  && unzip aws-sam-cli-linux-x86_64.zip -d sam-installation \
+  && ./sam-installation/install \
+  && rm -rf aws-sam-cli-linux-x86_64.zip sam-installation \
+  && sam --version
+
 # Install the devcontainer CLI
 RUN npm install -g "@devcontainers/cli@${devcontainerCliVersion}"