From d8763b6dbed3ecc1caf17868a149398cd471c38a Mon Sep 17 00:00:00 2001 From: Guillaume ETHEVE Date: Tue, 19 Nov 2024 22:10:23 +0100 Subject: [PATCH 1/5] Update dockerfile for new SIA infrastructure --- Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Dockerfile b/Dockerfile index a44f2ba5..3eb2968c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,19 @@ FROM node:18 AS base + +ARG NEXT_PUBLIC_API_URL=http://localhost:3000 +ARG NEXT_PUBLIC_UPLOADS_URL=https://arena.dev.uttnetgroup.fr/uploads/files +ARG ROBOTS_INDEX=enabled +ARG NEXT_PUBLIC_GOOGLE_VERIFICATION= +ARG NEXT_PUBLIC_URL=http://localhost:8080 +ARG NEXT_PUBLIC_STRIPE_PUBLIC_KEY= + +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 + RUN npm install -g pnpm FROM base AS builder From 2f743fba8ac63a6a56078bc429cb844d78547684 Mon Sep 17 00:00:00 2001 From: Blendman974 Date: Thu, 21 Nov 2024 13:26:58 +0100 Subject: [PATCH 2/5] Update ci.yml --- .github/workflows/ci.yml | 80 ++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5cecc18..25ebb2f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: lint: - runs-on: ubuntu-latest + runs-on: self-hosted strategy: matrix: node-version: [18] @@ -33,7 +33,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} build: - runs-on: ubuntu-latest + runs-on: self-hosted strategy: matrix: node-version: [18] @@ -58,34 +58,60 @@ jobs: url: ${{ secrets.SLACK_WEBHOOK_URL }} token: ${{ secrets.GITHUB_TOKEN }} - deploy: - if: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/teaser' || github.ref == 'refs/heads/dev') }} - runs-on: ubuntu-latest + deploy-dev: + if: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/dev') }} + runs-on: self-hosted needs: - lint - build - env: - RESOURCE_NAME: ${{ github.ref == 'refs/heads/master' && 'prod-front' || github.ref == 'refs/heads/teaser' && 'prod-teaser' || 'dev-front' }} steps: - - uses: actions/checkout@v3 - - name: Install oc - uses: redhat-actions/oc-installer@v1 + - uses: actions/checkout@v4 + - name: Install docker + uses: docker/setup-buildx-action@v3 + - name: Login to registry + uses: docker/login-action@v3 with: - oc_version: '4.6' - - name: Login to OKD - run: oc login --token=${{ secrets.OKD_TOKEN }} --server=${{ secrets.OKD_SERVER }} - - - name: Change the project - run: oc project ${{ secrets.OKD_PROJECT }} - - - name: Start the build - run: oc start-build ${{ env.RESOURCE_NAME }} --follow - - - uses: lazy-actions/slatify@master - if: ${{ always() }} + registry: ${{ secrets.REGISTRY_URL }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v6 + 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 }} + tags: | + ${{ secrets.REGISTRY_URL }}/uttarena/front:${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }} + deploy-prod: + if: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/master') }} + runs-on: self-hosted + needs: + - lint + - build + steps: + - uses: actions/checkout@v4 + - name: Install docker + uses: docker/setup-buildx-action@v3 + - name: Login to registry + uses: docker/login-action@v3 with: - type: ${{ job.status }} - job_name: '*Deployment to ${{ env.RESOURCE_NAME }}*' - commit: true - url: ${{ secrets.SLACK_WEBHOOK_URL }} - token: ${{ secrets.GITHUB_TOKEN }} + registry: ${{ secrets.REGISTRY_URL }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v6 + 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 }} + tags: | + ${{ secrets.REGISTRY_URL }}/uttarena/front:${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }} + From decee44ef02456226050deb0b91bc6f411bc810e Mon Sep 17 00:00:00 2001 From: Antoine Dufils Date: Sun, 24 Nov 2024 12:44:19 +0100 Subject: [PATCH 3/5] fix: update cash prize value in home page --- src/app/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 4e38bfc0..f12e8b8a 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -95,7 +95,7 @@ const Home = () => { - + From 0351c9a7a27d362a034d660207372a1306116664 Mon Sep 17 00:00:00 2001 From: Blendman974 Date: Tue, 26 Nov 2024 09:48:19 +0100 Subject: [PATCH 4/5] Update Dockerfile --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3eb2968c..944cc950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ 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 @@ -13,6 +14,7 @@ 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"] \ No newline at end of file +CMD ["node", "server.js"] From d1603fb1c6cd427f8fc18b11b0131545a8f368d1 Mon Sep 17 00:00:00 2001 From: Blendman974 Date: Tue, 26 Nov 2024 09:50:51 +0100 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25ebb2f2..ae4d8e59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,6 +84,7 @@ jobs: 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: @@ -112,6 +113,7 @@ jobs: 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' }}