Merge pull request #414 from ungdev/dev

merge Master
ungdev · Nov 26, 2024 · 1127552 · 1127552
2 parents 0936c17 + 3c0d823
commit 1127552
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,14 +76,15 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v6
-        with: 
+        with:
           push: true
           build-args: |
             NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL_DEV }}
             NEXT_PUBLIC_UPLOADS_URL=${{ secrets.NEXT_PUBLIC_UPLOADS_URL_DEV }}
             NEXT_PUBLIC_GOOGLE_VERIFICATION=${{ secrets.NEXT_PUBLIC_GOOGLE_VERIFICATION_DEV }}
             NEXT_PUBLIC_URL=${{ secrets.NEXT_PUBLIC_URL_DEV }}
             NEXT_PUBLIC_STRIPE_PUBLIC_KEY=${{ secrets.NEXT_PUBLIC_STRIPE_PUBLIC_KEY_DEV }}
+            ENVIRONMENT=${{ secrets.ENVIRONMENT_DEV }}
           tags: |
             ${{ secrets.REGISTRY_URL }}/uttarena/front:${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
   deploy-prod:
@@ -104,14 +105,15 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v6
-        with: 
+        with:
           push: true
           build-args: |
             NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}
             NEXT_PUBLIC_UPLOADS_URL=${{ secrets.NEXT_PUBLIC_UPLOADS_URL }}
             NEXT_PUBLIC_GOOGLE_VERIFICATION=${{ secrets.NEXT_PUBLIC_GOOGLE_VERIFICATION }}
             NEXT_PUBLIC_URL=${{ secrets.NEXT_PUBLIC_URL }}
             NEXT_PUBLIC_STRIPE_PUBLIC_KEY=${{ secrets.NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
+            ENVIRONMENT=${{ secrets.ENVIRONMENT }}
           tags: |
             ${{ secrets.REGISTRY_URL }}/uttarena/front:${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
 
diff --git a/Dockerfile b/Dockerfile
@@ -6,13 +6,15 @@ ARG ROBOTS_INDEX=enabled
 ARG NEXT_PUBLIC_GOOGLE_VERIFICATION=
 ARG NEXT_PUBLIC_URL=http://localhost:8080
 ARG NEXT_PUBLIC_STRIPE_PUBLIC_KEY=
+ARG ENVIRONMENT=developement
 
 ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
 ENV NEXT_PUBLIC_UPLOADS_URL=$NEXT_PUBLIC_UPLOADS_URL
 ENV ROBOTS_INDEX=$ROBOTS_INDEX
 ENV NEXT_PUBLIC_GOOGLE_VERIFICATION=$NEXT_PUBLIC_GOOGLE_VERIFICATION
 ENV NEXT_PUBLIC_URL=$NEXT_PUBLIC_URL
 ENV NEXT_PUBLIC_STRIPE_PUBLIC_KEY=$NEXT_PUBLIC_STRIPE_PUBLIC_KEY
+ENV ENVIRONMENT=$ENVIRONMENT
 
 RUN npm install -g pnpm
 
@@ -45,4 +47,4 @@ COPY --from=builder --chown=node:node /srv/app/.next/static ./.next/static
 RUN chown node:node .
 USER node
 
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]