From 436b37dd30c40e8467dcecc90ea0bee005f2ebb9 Mon Sep 17 00:00:00 2001 From: Abron Studio <110968521+AbronStudio@users.noreply.github.com> Date: Sat, 17 May 2025 15:21:38 +0330 Subject: [PATCH 1/4] Update .env.build --- .env.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.build b/.env.build index 73e8d2f4..5a17d0eb 100644 --- a/.env.build +++ b/.env.build @@ -1,2 +1,2 @@ -VITE_API_URL=__API_URL__ -VITE_THEMES_URL=https://themes.revolt.chat \ No newline at end of file +VITE_API_URL=https://pro.peptide.chat/api +VITE_THEMES_URL=https://themes.revolt.chat From 897bcc8a6d1f8b612b4b597a77849f7fb51aa15f Mon Sep 17 00:00:00 2001 From: Abron Studio <110968521+AbronStudio@users.noreply.github.com> Date: Sat, 17 May 2025 15:54:49 +0330 Subject: [PATCH 2/4] Update docker.yml --- .github/workflows/docker.yml | 126 +++++++++++++++++++++++------------ 1 file changed, 82 insertions(+), 44 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 91ee31a7..841e8fcd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,6 +4,7 @@ on: push: branches: - "master" + - "pre-production" tags: - "*" paths-ignore: @@ -18,6 +19,7 @@ on: pull_request: branches: - "master" + - "pre-production" paths-ignore: - ".github/**" - "!.github/workflows/docker.yml" @@ -30,39 +32,39 @@ on: workflow_dispatch: jobs: - test: - runs-on: ubuntu-latest - strategy: - matrix: - architecture: [linux/amd64] - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: "recursive" - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache/${{ matrix.architecture }} - key: ${{ runner.os }}-buildx-${{ matrix.architecture }}-${{ github.sha }} - - name: Build - uses: docker/build-push-action@v2 - with: - context: . - platforms: ${{ matrix.architecture }} - cache-from: type=local,src=/tmp/.buildx-cache/${{ matrix.architecture }} - cache-to: type=local,dest=/tmp/.buildx-cache-new/${{ matrix.architecture }},mode=max - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache/${{ matrix.architecture }} - mv /tmp/.buildx-cache-new/${{ matrix.architecture }} /tmp/.buildx-cache/${{ matrix.architecture }} + # test: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # architecture: [linux/amd64] + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # with: + # submodules: "recursive" + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v1 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v1 + # - name: Cache Docker layers + # uses: actions/cache@v2 + # with: + # path: /tmp/.buildx-cache/${{ matrix.architecture }} + # key: ${{ runner.os }}-buildx-${{ matrix.architecture }}-${{ github.sha }} + # - name: Build + # uses: docker/build-push-action@v2 + # with: + # context: . + # platforms: ${{ matrix.architecture }} + # cache-from: type=local,src=/tmp/.buildx-cache/${{ matrix.architecture }} + # cache-to: type=local,dest=/tmp/.buildx-cache-new/${{ matrix.architecture }},mode=max + # - name: Move cache + # run: | + # rm -rf /tmp/.buildx-cache/${{ matrix.architecture }} + # mv /tmp/.buildx-cache-new/${{ matrix.architecture }} /tmp/.buildx-cache/${{ matrix.architecture }} publish: - needs: [test] + # needs: [test] runs-on: ubuntu-latest if: github.event_name != 'pull_request' steps: @@ -83,18 +85,20 @@ jobs: id: meta uses: docker/metadata-action@v3 with: - images: revoltchat/client, ghcr.io/revoltchat/client - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + images: ghcr.io/abronstudio/revolt-revite-pre + tags: | + type=raw,value=${{ github.sha }} + # - name: Login to DockerHub + # uses: docker/login-action@v1 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Github Container Registry uses: docker/login-action@v1 with: registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + username: teamabron + password: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Build and publish uses: docker/build-push-action@v2 with: @@ -103,9 +107,43 @@ jobs: platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=local,src=/tmp/.buildx-cache/linux/amd64 - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: Move cache + # cache-from: type=local,src=/tmp/.buildx-cache/linux/amd64 + # cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + # - name: Move cache + # run: | + # rm -rf /tmp/.buildx-cache + # mv /tmp/.buildx-cache-new /tmp/.buildx-cache + deploy: + needs: [publish] + runs-on: ubuntu-latest + env: + CONFIG_BRANCH: main + CLONE_DIR: $GITHUB_WORKSPACE/config + CONFIG_FILE: $GITHUB_WORKSPACE/config/apps/pepchat/kustomization.yaml + if: github.event_name != 'pull_request' + steps: + - name: Checkout Configuration Repository run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache + echo "Cloning configuration repository" + mkdir -p $CLONE_DIR + git clone -b $CONFIG_BRANCH ${{ secrets.K8_CONFIG_REPO }} $CLONE_DIR + + - name: Set Up Git Identity + run: | + cd $CLONE_DIR + git config user.email "ci@example.com" + git config user.name "CI Bot" + + + - name: Update Image Tag in kustomization.yaml + run: | + awk -v value=" newTag: ${{ github.sha }}" '{sub(/^ newTag: .*/, value); print}' $CONFIG_FILE > temp.yml && mv temp.yml $CONFIG_FILE + awk -v value=" newName: ghcr.io/abronstudio/revolt-revite-pre" '{sub(/^ newName: .*/, value); print}' $CONFIG_FILE > temp.yml && mv temp.yml $CONFIG_FILE + + + - name: Commit & Push Changes + run: | + cd $CLONE_DIR + git add . + git commit -am "Update image tag to ${{ github.sha }}" + git push origin $CONFIG_BRANCH From 4aeec1de0ef72bd83e0bb64eccb0020a8cc880fe Mon Sep 17 00:00:00 2001 From: Abron Studio <110968521+AbronStudio@users.noreply.github.com> Date: Sat, 17 May 2025 15:58:00 +0330 Subject: [PATCH 3/4] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 841e8fcd..111e3970 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -77,7 +77,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Cache amd64 Docker layers - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.buildx-cache/linux/amd64 key: ${{ runner.os }}-buildx-linux/amd64-${{ github.sha }} From 7a04f5b7b01ffe8587349b0dee2a045af44f98fa Mon Sep 17 00:00:00 2001 From: Abron Studio <110968521+AbronStudio@users.noreply.github.com> Date: Sat, 17 May 2025 16:01:51 +0330 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b74e23b8..5e59620a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM node:16-buster AS builder - +ENV NODE_OPTIONS="--max_old_space_size=16384" WORKDIR /usr/src/app -COPY ./revolt-revite . -COPY ./revolt-revite/.env.build ./revolt-revite/.env +COPY . . +COPY .env.build ./.env RUN yarn install --frozen-lockfile RUN yarn build:deps