Reverts staging build changes (#2966)

marcinciarka · web-flow · commit a7532608138a · 2023-10-12T10:59:49.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -4,13 +4,8 @@
 .pre-commit*
 codecov.yml
 node_modules
-!node_modules/ts-node
-!node_modules/pg
-!node_modules/@types/pg
-!node_modules/dotenv
-!node_modules/postgres-migrations
 .env
 .env*.local
 ./server/database/.env
 ./server/database/.env.*
-.vercel
+.vercel
diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml
@@ -3,86 +3,22 @@ on:
     branches:
       - dev
 
-name: Build and deploy to AWS Staging
+name: Deploy to AWS Staging
 
 jobs:
   deploy:
-    name: Build and deploy to AWS Staging
+    name: Deploy
     runs-on: ubuntu-latest
     env:
       AWS_REGION: eu-central-1
-      ENVIRONMENT_TAG: staging
+      ECR_REPO_NAME: summer-fi-staging
       SERVICE_NAME: summer-fi-staging
       CLUSTER_NAME: summer-fi-staging
-      CONFIG_URL: ${{ secrets.CONFIG_URL }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.12
-
-      - name: Extract commit hash
-        id: vars
-        shell: bash
-        run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-
-      - name: Use modules cache
-        uses: actions/cache@v3
-        id: yarn-cache
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Install packages
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
-        run: yarn --no-progress --non-interactive --frozen-lockfile
-
-      - name: Run postinstall
-        if: steps.yarn-cache.outputs.cache-hit == 'true'
-        run: yarn postinstall
-
-      - name: Use next cache
-        uses: jongwooo/next-cache@v1
-
-      - name: Build standalone app
-        id: build-app
-        env:
-          NODE_OPTIONS: '--max_old_space_size=4096'
-          SHA_TAG: ${{ steps.vars.outputs.sha_short }}
-          LATEST_TAG: latest
-          CONFIG_URL: ${{ secrets.CONFIG_URL }}
-          COMMIT_SHA: ${{ steps.vars.outputs.sha_short }}
-          NOTIFICATIONS_HOST: ${{ secrets.NOTIFICATIONS_HOST_STAGING }}
-          NOTIFICATIONS_HOST_GOERLI: ${{ secrets.NOTIFICATIONS_HOST_STAGING_GOERLI }}
-          AJNA_SUBGRAPH_URL: ${{ secrets.AJNA_SUBGRAPH_URL_STAGING }}
-          AJNA_SUBGRAPH_URL_GOERLI: ${{ secrets.AJNA_SUBGRAPH_URL_GOERLI }}
-          AJNA_SUBGRAPH_V2_URL: ${{ secrets.AJNA_SUBGRAPH_V2_URL_STAGING }}
-          AJNA_SUBGRAPH_V2_URL_GOERLI: ${{ secrets.AJNA_SUBGRAPH_V2_URL_GOERLI }}
-          MIXPANEL_ENV: staging
-          MIXPANEL_KEY: ${{ secrets.MIXPANEL_KEY_STAGING }}
-          ADROLL_ADV_ID: ${{ secrets.ADROLL_ADV_ID_STAGING }}
-          ADROLL_PIX_ID: ${{ secrets.ADROLL_PIX_ID_STAGING }}
-          MAINNET_CACHE_URL: ${{ secrets.MAINNET_CACHE_URL_STAGING }}
-          MAILCHIMP_ENDPOINT: ${{ secrets.MAILCHIMP_ENDPOINT }}
-          MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID_STAGING }}
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-          BLOCKNATIVE_API_KEY: ${{ secrets.BLOCKNATIVE_API_KEY_STAGING }}
-          SHOW_BUILD_INFO: 1
-          NODE_ENV: production
-          NEXT_PUBLIC_SENTRY_ENV: staging
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          PRODUCT_HUB_KEY: ${{ secrets.PRODUCT_HUB_KEY }}
-          ONE_INCH_API_KEY: ${{ secrets.ONE_INCH_API_KEY_STAGING }}
-          ONE_INCH_API_URL: ${{ secrets.ONE_INCH_API_URL_STAGING }}
-          REFERRAL_SUBGRAPH_URL: ${{ secrets.REFERRAL_SUBGRAPH_URL_STAGING }}
-        run: yarn build
-
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
@@ -94,18 +30,51 @@ jobs:
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v1
 
-      - name: Build runner image
+      - name: Extract commit hash
+        id: vars
+        shell: bash
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
+      - name: Build, tag, and push image to Amazon ECR
         id: build-image
         env:
           SHA_TAG: ${{ steps.vars.outputs.sha_short }}
           LATEST_TAG: latest
-          ECR_REPO_NAME: summer-fi-staging
+          ENVIRONMENT_TAG: staging
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          CONFIG_URL: ${{ secrets.CONFIG_URL }}
         run: |
           # Build a docker container and
           # push it to ECR so that it can
           # be deployed to ECS.
-          docker build --cache-from=$ECR_REGISTRY/$ECR_REPO_NAME:$LATEST_TAG \
+          docker build --build-arg COMMIT_SHA=${{ env.SHA_TAG }} \
+                       --build-arg NOTIFICATIONS_HOST=${{ secrets.NOTIFICATIONS_HOST_STAGING }} \
+                       --build-arg NOTIFICATIONS_HOST_GOERLI=${{ secrets.NOTIFICATIONS_HOST_STAGING_GOERLI }} \
+                       --build-arg AJNA_SUBGRAPH_URL=${{ secrets.AJNA_SUBGRAPH_URL_STAGING }} \
+                       --build-arg AJNA_SUBGRAPH_URL_GOERLI=${{ secrets.AJNA_SUBGRAPH_URL_GOERLI }} \
+                       --build-arg AJNA_SUBGRAPH_V2_URL=${{ secrets.AJNA_SUBGRAPH_V2_URL_STAGING }} \
+                       --build-arg AJNA_SUBGRAPH_V2_URL_GOERLI=${{ secrets.AJNA_SUBGRAPH_V2_URL_GOERLI }} \
+                       --build-arg MIXPANEL_ENV=staging \
+                       --build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_KEY_STAGING }} \
+                       --build-arg ADROLL_ADV_ID=${{ secrets.ADROLL_ADV_ID_STAGING }} \
+                       --build-arg ADROLL_PIX_ID=${{ secrets.ADROLL_PIX_ID_STAGING }} \
+                       --build-arg MAINNET_CACHE_URL=${{ secrets.MAINNET_CACHE_URL_STAGING }} \
+                       --build-arg MAILCHIMP_ENDPOINT=${{ secrets.MAILCHIMP_ENDPOINT }} \
+                       --build-arg MAILCHIMP_API_KEY=${{ secrets.MAILCHIMP_API_KEY }} \
+                       --build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID_STAGING }} \
+                       --build-arg ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }} \
+                       --build-arg BLOCKNATIVE_API_KEY=${{ secrets.BLOCKNATIVE_API_KEY_STAGING }} \
+                       --build-arg SHOW_BUILD_INFO=1 \
+                       --build-arg NODE_ENV=production \
+                       --build-arg NEXT_PUBLIC_SENTRY_ENV=staging \
+                       --build-arg SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
+                       --build-arg PRODUCT_HUB_KEY=${{ secrets.PRODUCT_HUB_KEY }} \
+                       --build-arg ONE_INCH_API_KEY=${{ secrets.ONE_INCH_API_KEY_STAGING }} \
+                       --build-arg ONE_INCH_API_URL=${{ secrets.ONE_INCH_API_URL_STAGING }} \
+                       --build-arg REFERRAL_SUBGRAPH_URL=${{ secrets.REFERRAL_SUBGRAPH_URL_STAGING }} \
+                       --build-arg CONFIG_URL=${{ secrets.CONFIG_URL }} \
+                       --cache-from=$ECR_REGISTRY/$ECR_REPO_NAME:$LATEST_TAG \
                        -t $ECR_REGISTRY/$ECR_REPO_NAME:$SHA_TAG \
                        -t $ECR_REGISTRY/$ECR_REPO_NAME:$LATEST_TAG \
                        -t $ECR_REGISTRY/$ECR_REPO_NAME:$ENVIRONMENT_TAG \
@@ -125,5 +94,5 @@ jobs:
 
       - name: Invalidate CloudFront
         run:
-          AWS_MAX_ATTEMPTS=10 aws cloudfront create-invalidation --distribution-id
-          ${{secrets.CF_DIST_ID_STAGING }} --paths "/*"
+          AWS_MAX_ATTEMPTS=10 aws cloudfront create-invalidation --distribution-id ${{
+          secrets.CF_DIST_ID_STAGING }} --paths "/*"
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,75 @@
-FROM node:18.18-alpine
+FROM node:18.12
+
 EXPOSE 3000
-COPY server/database /app/server/database
-WORKDIR /app/server/database
-RUN npm install
-WORKDIR /app
-COPY .next/static /app/.next/static
-COPY .next/standalone /app/.next/standalone
-COPY package.json yarn.lock next.config.js /app
-COPY public /app/public
+
+COPY package.json /usr/src/app/package.json
+COPY yarn.lock /usr/src/app/yarn.lock
+COPY ./server/ /usr/src/app/server
+COPY ./scripts/get-config-types.js /usr/src/app/scripts/get-config-types.js
+COPY ./blockchain/abi/*.json /usr/src/app/blockchain/abi/
+
+WORKDIR /usr/src/app
+
+ARG CONFIG_URL=''
+ENV CONFIG_URL=$CONFIG_URL
+
+RUN yarn --no-progress --non-interactive --frozen-lockfile
+
+ARG COMMIT_SHA='' \
+  NOTIFICATIONS_HOST='' \
+  NOTIFICATIONS_HOST_GOERLI='' \
+  AJNA_SUBGRAPH_URL='' \
+  AJNA_SUBGRAPH_URL_GOERLI='' \
+  AJNA_SUBGRAPH_V2_URL='' \
+  AJNA_SUBGRAPH_V2_URL_GOERLI='' \
+  MIXPANEL_ENV='' \
+  MIXPANEL_KEY='' \
+  ADROLL_ADV_ID='' \
+  ADROLL_PIX_ID='' \
+  MAINNET_CACHE_URL='' \
+  SHOW_BUILD_INFO='' \
+  ETHERSCAN_API_KEY='' \
+  BLOCKNATIVE_API_KEY='' \
+  INFURA_PROJECT_ID='' \
+  NODE_ENV='' \
+  NEXT_PUBLIC_SENTRY_ENV='' \
+  SENTRY_AUTH_TOKEN='' \
+  PRODUCT_HUB_KEY='' \
+  ONE_INCH_API_KEY='' \
+  ONE_INCH_API_URL='' \
+  REFERRAL_SUBGRAPH_URL=''
+
+ENV COMMIT_SHA=$COMMIT_SHA \
+  NOTIFICATIONS_HOST=$NOTIFICATIONS_HOST \
+  NOTIFICATIONS_HOST_GOERLI=$NOTIFICATIONS_HOST_GOERLI \
+  AJNA_SUBGRAPH_URL=$AJNA_SUBGRAPH_URL \
+  AJNA_SUBGRAPH_URL_GOERLI=$AJNA_SUBGRAPH_URL_GOERLI \
+  AJNA_SUBGRAPH_V2_URL=$AJNA_SUBGRAPH_V2_URL \
+  AJNA_SUBGRAPH_V2_URL_GOERLI=$AJNA_SUBGRAPH_V2_URL_GOERLI \
+  MIXPANEL_ENV=$MIXPANEL_ENV \
+  MIXPANEL_KEY=$MIXPANEL_KEY \
+  ADROLL_ADV_ID=$ADROLL_ADV_ID \
+  ADROLL_PIX_ID=$ADROLL_PIX_ID \
+  MAINNET_CACHE_URL=$MAINNET_CACHE_URL \
+  ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY \
+  BLOCKNATIVE_API_KEY=$BLOCKNATIVE_API_KEY \
+  INFURA_PROJECT_ID=$INFURA_PROJECT_ID \
+  USE_TERMS_OF_SERVICE=1 \
+  USE_TRM_API=1 \
+  SHOW_BUILD_INFO=$SHOW_BUILD_INFO \
+  NODE_ENV=$NODE_ENV \
+  SENTRY_RELEASE=$COMMIT_SHA \
+  NEXT_PUBLIC_SENTRY_ENV=$NEXT_PUBLIC_SENTRY_ENV \
+  SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN \
+  PRODUCT_HUB_KEY=$PRODUCT_HUB_KEY \
+  ONE_INCH_API_KEY=$ONE_INCH_API_KEY \
+  ONE_INCH_API_URL=$ONE_INCH_API_URL \
+  REFERRAL_SUBGRAPH_URL=$REFERRAL_SUBGRAPH_URL \
+  NODE_OPTIONS=--max-old-space-size=6144
+
+COPY . .
+
+RUN chmod +x ./scripts/wait-for-it.sh \
+  && npm run build
 
 CMD [ "npm", "run", "start:prod" ]
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "start": "yarn get-config-types && next dev",
     "get-config-types": "node scripts/get-config-types.js",
     "start:debug": "NODE_OPTIONS='--inspect' next dev",
-    "start:prod": "npx ts-node server/database/migrate.ts && node .next/standalone/server.js",
+    "start:prod": "yarn migrate && next start",
     "start:preview": "yarn build:8gb && next start -p 3000",
     "migrate": "npx ts-node server/database/migrate.ts",
     "prisma:introspect": "prisma introspect --schema=./server/database/schema.prisma",
