refactor: replace nginx-serve with web-app-serve

Author: thenav56

.dockerignore

@@ -107,6 +107,7 @@ build/Release
 
 # Dependency directories
 node_modules
+**/node_modules
 jspm_packages
 
 # Typescript v1 declaration files
@@ -145,4 +146,4 @@ Dockerfile
 .dockerignore
 
 # git
-.gitignore
+.gitignore

.github/workflows/publish-web-app-serve.yml

@@ -1,4 +1,4 @@
-name: Publish Helm
+name: Publish web app serve
 
 on:
   workflow_dispatch:
@@ -10,138 +10,14 @@ on:
 permissions:
   packages: write
 
-
 jobs:
   publish_image:
     name: Publish Docker Image
     runs-on: ubuntu-latest
-
-    outputs:
-      docker_image_name: ${{ steps.prep.outputs.tagged_image_name }}
-      docker_image_tag: ${{ steps.prep.outputs.tag }}
-      docker_image: ${{ steps.prep.outputs.tagged_image }}
-
     steps:
-      - uses: actions/checkout@main
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 🐳 Prepare Docker
-        id: prep
-        env:
-          IMAGE_NAME: ghcr.io/${{ github.repository }}
-        run: |
-          BRANCH_NAME=$(echo $GITHUB_REF_NAME | sed 's|[/:]|-|' | tr '[:upper:]' '[:lower:]' | sed 's/_/-/g' | cut -c1-100 | sed 's/-*$//')
-
-          # XXX: Check if there is a slash in the BRANCH_NAME eg: project/add-docker
-          if [[ "$BRANCH_NAME" == *"/"* ]]; then
-              # XXX: Change the docker image package to -alpha
-              IMAGE_NAME="$IMAGE_NAME-alpha"
-              TAG="$(echo "$BRANCH_NAME" | sed 's|/|-|g').$(echo $GITHUB_SHA | head -c7)"
-          else
-              TAG="$BRANCH_NAME.$(echo $GITHUB_SHA | head -c7)"
-          fi
-
-          IMAGE_NAME=$(echo $IMAGE_NAME | tr '[:upper:]' '[:lower:]')
-          echo "tagged_image_name=${IMAGE_NAME}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-          echo "tagged_image=${IMAGE_NAME}:${TAG}" >> $GITHUB_OUTPUT
-          echo "::notice::Tagged docker image: ${IMAGE_NAME}:${TAG}"
-
-      - name: 🐳 Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: 🐳 Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.ref }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-refs/develop
-            ${{ runner.os }}-buildx-
+      - uses: actions/checkout@v4
 
-      - name: 🐳 Docker build
-        uses: docker/build-push-action@v6
+      - name: Publish web-app-serve
+        uses: toggle-corp/web-app-serve/.github/actions/[email protected]
         with:
-          context: .
-          builder: ${{ steps.buildx.outputs.name }}
-          file: nginx-serve/Dockerfile
-          target: nginx-serve
-          load: true
-          push: true
-          tags: ${{ steps.prep.outputs.tagged_image }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-          build-args: |
-            "APP_SENTRY_TRACES_SAMPLE_RATE=0.8"
-            "APP_SENTRY_REPLAYS_SESSION_SAMPLE_RATE=0.8"
-            "APP_SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE=0.8"
-
-      - name: 🐳 Move docker cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-  publish_helm:
-    name: Publish Helm
-    needs: publish_image
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Install Helm
-      uses: azure/setup-helm@v3
-
-    - name: Tag docker image in Helm Chart values.yaml
-      env:
-        IMAGE_NAME: ${{ needs.publish_image.outputs.docker_image_name }}
-        IMAGE_TAG: ${{ needs.publish_image.outputs.docker_image_tag }}
-      run: |
-        # Update values.yaml with latest docker image
-        sed -i "s|SET-BY-CICD-IMAGE|$IMAGE_NAME|" nginx-serve/helm/values.yaml
-        sed -i "s/SET-BY-CICD-TAG/$IMAGE_TAG/" nginx-serve/helm/values.yaml
-
-    - name: Package Helm Chart
-      id: set-variables
-      run: |
-        # XXX: Check if there is a slash in the BRANCH_NAME eg: project/add-docker
-        if [[ "$GITHUB_REF_NAME" == *"/"* ]]; then
-            # XXX: Change the helm chart to <chart-name>-alpha
-            sed -i 's/^name: \(.*\)/name: \1-alpha/' nginx-serve/helm/Chart.yaml
-        fi
-
-        SHA_SHORT=$(git rev-parse --short HEAD)
-        sed -i "s/SET-BY-CICD/$SHA_SHORT/g" nginx-serve/helm/Chart.yaml
-        helm package ./nginx-serve/helm -d .helm-charts
-
-    - name: Push Helm Chart
-      env:
-        IMAGE: ${{ needs.publish_image.outputs.docker_image }}
-        OCI_REPO: oci://ghcr.io/${{ github.repository }}
-      run: |
-        OCI_REPO=$(echo $OCI_REPO | tr '[:upper:]' '[:lower:]')
-        PACKAGE_FILE=$(ls .helm-charts/*.tgz | head -n 1)
-        echo "# Helm Chart" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "Tagged Image: **$IMAGE**" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "Helm push output" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo '```bash' >> $GITHUB_STEP_SUMMARY
-        helm push "$PACKAGE_FILE" $OCI_REPO >> $GITHUB_STEP_SUMMARY
-        echo '```' >> $GITHUB_STEP_SUMMARY
+          github_token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -10,7 +10,7 @@ RUN corepack enable
 WORKDIR /code
 
 # -------------------------- Nginx - Builder --------------------------------
-FROM dev AS nginx-build
+FROM dev AS web-app-build
 
 # NOTE: --parents is not yet available in stable syntax, using docker/dockerfile:1-labs
 COPY --parents package.json pnpm-lock.yaml pnpm-workspace.yaml ./**/package.json patches/ /code/
@@ -42,16 +42,14 @@ ENV APP_SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE=${APP_SENTRY_REPLAYS_ON_ERROR_SAMPLE
 RUN pnpm build
 
 # ---------------------------------------------------------------------------
-FROM nginx:bookworm AS nginx-serve
+FROM ghcr.io/toggle-corp/web-app-serve:v0.1.1 AS web-app-serve
 
 LABEL maintainer="IFRC"
 LABEL org.opencontainers.image.source="https://github.com/IFRCGo/go-web-app"
 
-COPY ./nginx-serve/apply-config.sh /docker-entrypoint.d/
-COPY ./nginx-serve/nginx.conf.template /etc/nginx/templates/default.conf.template
-COPY --from=nginx-build /code/build /code/build
-
 # NOTE: Used by apply-config.sh
+ENV APPLY_CONFIG__APPLY_CONFIG_PATH=/code/apply-config.sh
 ENV APPLY_CONFIG__SOURCE_DIRECTORY=/code/build/
-ENV APPLY_CONFIG__DESTINATION_DIRECTORY=/usr/share/nginx/html/
-ENV APPLY_CONFIG__OVERWRITE_DESTINATION=true
+
+COPY --from=web-app-build /code/build "$APPLY_CONFIG__SOURCE_DIRECTORY"
+COPY ./web-app-serve/apply-config.sh "$APPLY_CONFIG__APPLY_CONFIG_PATH"

web-app-serve/apply-config.sh

@@ -1,29 +1,5 @@
 #!/bin/bash -xe
 
-SOURCE_DIRECTORY=${APPLY_CONFIG__SOURCE_DIRECTORY?Required}
-DESTINATION_DIRECTORY=${APPLY_CONFIG__DESTINATION_DIRECTORY?Required}
-
-# Parse arguments for --overwrite option
-OVERWRITE_DESTINATION=${APPLY_CONFIG__OVERWRITE_DESTINATION:-false}
-for arg in "$@"; do
-  if [[ "$arg" == "--overwrite" ]]; then
-    OVERWRITE_DESTINATION=true
-  fi
-done
-
-if [ -d "$DESTINATION_DIRECTORY" ]; then
-  if [ "$OVERWRITE_DESTINATION" == "true" ]; then
-    echo "Destination directory <$DESTINATION_DIRECTORY> already exists. Force deleting..."
-    rm -rf "$DESTINATION_DIRECTORY"
-  else
-    echo "Destination directory <$DESTINATION_DIRECTORY> already exists. Please delete and try again, or use --overwrite to force delete."
-    exit 1
-  fi
-fi
-
-mkdir -p $(dirname "$DESTINATION_DIRECTORY")
-cp -r --no-target-directory "$SOURCE_DIRECTORY" "$DESTINATION_DIRECTORY"
-
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_TITLE_PLACEHOLDER\>|$APP_TITLE|g" {} +
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_ENVIRONMENT_PLACEHOLDER\>|$APP_ENVIRONMENT|g" {} +
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_MAPBOX_ACCESS_TOKEN_PLACEHOLDER\>|$APP_MAPBOX_ACCESS_TOKEN|g" {} +
@@ -34,9 +10,3 @@ find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<https://APP-API-ENDPOINT
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<https://APP-RISK-API-ENDPOINT-PLACEHOLDER.COM/|$APP_RISK_API_ENDPOINT|g" {} +
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<https://APP-SDT-URL-PLACEHOLDER.COM/|$APP_SDT_URL|g" {} +
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<https://APP-SENTRY-DSN-PLACEHOLDER.COM\>|$APP_SENTRY_DSN|g" {} +
-
-# Show diffs (Useful to debug issues)
-set +xe
-find "$SOURCE_DIRECTORY" -type f -printf '%P\n' | while IFS= read -r file; do
-    diff -W 100 <(fold -w 100 "$SOURCE_DIRECTORY/$file") <(fold -w 100 "$DESTINATION_DIRECTORY/$file") --suppress-common-lines
-done

web-app-serve/docker-compose.yml

@@ -0,0 +1,25 @@
+name: go-api-web-app-serve
+
+services:
+  web-app-serve:
+    build:
+      context: ../
+      target: web-app-serve
+    environment:
+      APPLY_CONFIG__ENABLE_DEBUG: true
+      # App configs (Placeholder replacement)
+      APP_TITLE: ${APP_TITLE:-GO API}
+      APP_ENVIRONMENT: ${APP_ENVIRONMENT:-Staging}
+      APP_MAPBOX_ACCESS_TOKEN: ${APP_MAPBOX_ACCESS_TOKEN:-my-secret-mapbox-access-token}
+      APP_TINY_API_KEY: ${APP_TINY_API_KEY:-my-secret-tiny-api-key}
+      APP_API_ENDPOINT: ${APP_API_ENDPOINT:-https://goadmin-stage.ifrc.org/api/}
+      APP_RISK_API_ENDPOINT: ${APP_RISK_API_ENDPOINT:-https://go-risk-staging.northeurope.cloudapp.azure.com/api/}
+      APP_SDT_URL: ${APP_SDT_URL:-https://surveydesigner-stage-api.ifrc.org}
+      APP_SENTRY_DSN: ${APP_SENTRY_DSN:-https://[email protected]/123}
+    ports:
+      - '8001:80'
+    develop:
+      watch:
+        - action: sync+restart
+          path: ./apply-config.sh
+          target: /code/apply-config.sh