chore: Fix platform dockerfile; Fix CLI CI

keyshade-xyz · Jan 23, 2025 · 73c374c · 73c374c
1 parent dec0926
commit 73c374c
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 95 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -154,95 +154,95 @@ jobs:
             --validate \
             --rewrite
 
-  deploy-platform:
-    needs: release
-    runs-on: ubuntu-latest
-    environment: ${{ needs.release.outputs.environment }}
-    name: Deploy Platform
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker Login
-        uses: azure/docker-login@v2
-        with:
-          login-server: ${{ vars.ACR_REGISTRY_URL }}
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
-
-      - name: Build and push docker image
-        id: build
-        env:
-          ACR_REGISTRY_URL: ${{ vars.ACR_REGISTRY_URL }}
-          REPOSITORY_NAME: platform
-          LATEST_TAG: ${{ needs.release.outputs.latestTag }}
-          NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
-          NEXT_PUBLIC_SENTRY_PLATFORM_DSN: ${{ secrets.NEXT_PUBLIC_SENTRY_PLATFORM_DSN }}
-          NEXT_PUBLIC_SENTRY_PLATFORM_PROFILE_SAMPLE_RATE: ${{ vars.NEXT_PUBLIC_SENTRY_PLATFORM_PROFILE_SAMPLE_RATE }}
-          NEXT_PUBLIC_SENTRY_PLATFORM_TRACES_SAMPLE_RATE: ${{ vars.NEXT_PUBLIC_SENTRY_PLATFORM_TRACES_SAMPLE_RATE }}
-          NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ needs.release.outputs.environment }}
-        run: |
-          VERSION=`jq -r '.version' package.json`
-          # Build a docker container and push it to ACR
-          docker build \
-            -t $ACR_REGISTRY_URL/$REPOSITORY_NAME:$VERSION \
-            -t $ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG \
-            --build-arg NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL \
-            -f ./apps/platform/Dockerfile .
-          echo "Pushing image to ACR..."
-          docker push $ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG
-          docker push $ACR_REGISTRY_URL/$REPOSITORY_NAME:$VERSION
-          echo "name=image::$ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG" >> $GITHUB_OUTPUT
-
-      - name: Azure Login action
-        uses: azure/login@v2
-        with:
-          creds: ${{ secrets.CONTAINER_APP_SP_CREDENTIALS }}
-          enable-AzPSSession: true
-
-      - name: Update Azure Container App
-        uses: azure/cli@v2
-        env:
-          PLATFORM_CONTAINER: ${{ vars.PLATFORM_CONTAINER }}
-          PLATFORM_CONTAINER_RG: ${{ vars.PLATFORM_CONTAINER_RG }}
-          ACR_REGISTRY_URL: ${{ vars.ACR_REGISTRY_URL }}
-          REPOSITORY_NAME: platform
-        with:
-          azcliversion: latest
-          inlineScript: |
-            az containerapp update \
-              --name $PLATFORM_CONTAINER \
-              --resource-group $PLATFORM_CONTAINER_RG \
-              --image $ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG
-
-  release-sentry-platform:
-    name: Sentry Platform
-    runs-on: ubuntu-latest
-    environment: ${{ needs.release.outputs.environment }}
-    needs: [deploy-api, deploy-web, deploy-platform, release]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Sentry CLI
-        run: npm i -g @sentry/cli
-
-      - name: Sentry Release
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ vars.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ vars.SENTRY_PLATFORM_PROJECT }}
-          ENVIRONMENT: ${{ needs.release.outputs.environment }}
-        run: |
-          RELEASE=`jq -r '.version' package.json`
-          sentry-cli releases -o $SENTRY_ORG new -p $SENTRY_PROJECT $VERSION
-          sentry-cli releases set-commits --auto $VERSION  
-          sentry-cli releases deploys $VERSION new -e $ENVIRONMENT
-          sentry-cli releases files $VERSION upload-sourcemaps apps/platform/.next \
-            --url-prefix '~/_next' \
-            --validate \
-            --rewrite
+  # deploy-platform:
+  #   needs: release
+  #   runs-on: ubuntu-latest
+  #   environment: ${{ needs.release.outputs.environment }}
+  #   name: Deploy Platform
+
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+
+  #     - name: Docker Login
+  #       uses: azure/docker-login@v2
+  #       with:
+  #         login-server: ${{ vars.ACR_REGISTRY_URL }}
+  #         username: ${{ secrets.ACR_USERNAME }}
+  #         password: ${{ secrets.ACR_PASSWORD }}
+
+  #     - name: Build and push docker image
+  #       id: build
+  #       env:
+  #         ACR_REGISTRY_URL: ${{ vars.ACR_REGISTRY_URL }}
+  #         REPOSITORY_NAME: platform
+  #         LATEST_TAG: ${{ needs.release.outputs.latestTag }}
+  #         NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
+  #         NEXT_PUBLIC_SENTRY_PLATFORM_DSN: ${{ secrets.NEXT_PUBLIC_SENTRY_PLATFORM_DSN }}
+  #         NEXT_PUBLIC_SENTRY_PLATFORM_PROFILE_SAMPLE_RATE: ${{ vars.NEXT_PUBLIC_SENTRY_PLATFORM_PROFILE_SAMPLE_RATE }}
+  #         NEXT_PUBLIC_SENTRY_PLATFORM_TRACES_SAMPLE_RATE: ${{ vars.NEXT_PUBLIC_SENTRY_PLATFORM_TRACES_SAMPLE_RATE }}
+  #         NEXT_PUBLIC_SENTRY_ENVIRONMENT: ${{ needs.release.outputs.environment }}
+  #       run: |
+  #         VERSION=`jq -r '.version' package.json`
+  #         # Build a docker container and push it to ACR
+  #         docker build \
+  #           -t $ACR_REGISTRY_URL/$REPOSITORY_NAME:$VERSION \
+  #           -t $ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG \
+  #           --build-arg NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL \
+  #           -f ./apps/platform/Dockerfile .
+  #         echo "Pushing image to ACR..."
+  #         docker push $ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG
+  #         docker push $ACR_REGISTRY_URL/$REPOSITORY_NAME:$VERSION
+  #         echo "name=image::$ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG" >> $GITHUB_OUTPUT
+
+  #     - name: Azure Login action
+  #       uses: azure/login@v2
+  #       with:
+  #         creds: ${{ secrets.CONTAINER_APP_SP_CREDENTIALS }}
+  #         enable-AzPSSession: true
+
+  #     - name: Update Azure Container App
+  #       uses: azure/cli@v2
+  #       env:
+  #         PLATFORM_CONTAINER: ${{ vars.PLATFORM_CONTAINER }}
+  #         PLATFORM_CONTAINER_RG: ${{ vars.PLATFORM_CONTAINER_RG }}
+  #         ACR_REGISTRY_URL: ${{ vars.ACR_REGISTRY_URL }}
+  #         REPOSITORY_NAME: platform
+  #       with:
+  #         azcliversion: latest
+  #         inlineScript: |
+  #           az containerapp update \
+  #             --name $PLATFORM_CONTAINER \
+  #             --resource-group $PLATFORM_CONTAINER_RG \
+  #             --image $ACR_REGISTRY_URL/$REPOSITORY_NAME:$LATEST_TAG
+
+  # release-sentry-platform:
+  #   name: Sentry Platform
+  #   runs-on: ubuntu-latest
+  #   environment: ${{ needs.release.outputs.environment }}
+  #   needs: [deploy-api, deploy-web, deploy-platform, release]
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+
+  #     - name: Install Sentry CLI
+  #       run: npm i -g @sentry/cli
+
+  #     - name: Sentry Release
+  #       env:
+  #         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  #         SENTRY_ORG: ${{ vars.SENTRY_ORG }}
+  #         SENTRY_PROJECT: ${{ vars.SENTRY_PLATFORM_PROJECT }}
+  #         ENVIRONMENT: ${{ needs.release.outputs.environment }}
+  #       run: |
+  #         RELEASE=`jq -r '.version' package.json`
+  #         sentry-cli releases -o $SENTRY_ORG new -p $SENTRY_PROJECT $VERSION
+  #         sentry-cli releases set-commits --auto $VERSION
+  #         sentry-cli releases deploys $VERSION new -e $ENVIRONMENT
+  #         sentry-cli releases files $VERSION upload-sourcemaps apps/platform/.next \
+  #           --url-prefix '~/_next' \
+  #           --validate \
+  #           --rewrite
 
   deploy-web:
     runs-on: ubuntu-latest
@@ -367,7 +367,7 @@ jobs:
           echo "Current version: $current_version"
           echo "Published version: $published_version"
 
-          if [ "$current_version" == "$published_version" ]; then
+          if [ "$current_version" = "$published_version" ]; then
             echo "Published version of @keyshade/cli is same as the current version: $current_version. Skipping publish."
             exit 0
           fi
@@ -378,10 +378,6 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           scope: '@keyshade'
 
-      - name: Get published version
-        id: published_version
-        run: echo "published_version=$(npm show @keyshade/cli version)" >> $GITHUB_ENV
-
       - name: Install pnpm
         run: npm i -g pnpm
 

diff --git a/apps/platform/Dockerfile b/apps/platform/Dockerfile
@@ -46,7 +46,8 @@ COPY --from=installer /app/apps/platform/package.json .
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=installer  --chown=nextjs:nodejs /app/apps/platform/.next ./apps/platform/.next
+COPY --from=installer  --chown=nextjs:nodejs /app/apps/platform/.next/standalone ./
+COPY --from=installer  --chown=nextjs:nodejs /app/apps/platform/.next/static ./apps/platform/.next/static
 COPY --from=installer  --chown=nextjs:nodejs /app/apps/platform/public ./apps/platform/public
 
 

diff --git a/apps/platform/next.config.js b/apps/platform/next.config.js
@@ -1,6 +1,8 @@
 const path = require('node:path')
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  output: 'standalone',
+  pageExtensions: ['md', 'mdx', 'ts', 'tsx'],
   webpack(config, { isServer }) {
     config.module.rules.push({
       test: /\.svg$/,