diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index ecbb8a7..d651b30 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -12,7 +12,7 @@ on: - "client/**" jobs: - publish-tauri: + publish-windows: runs-on: ubuntu-latest steps: @@ -28,37 +28,37 @@ jobs: persist-credentials: false - name: Build - run: docker build -t chad-client -f ./client/Dockerfile.windows ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} + run: docker build -t chad-client-windows -f ./client/Dockerfile.windows ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} - publish-web: - runs-on: ubuntu-latest + # publish-web: + # runs-on: ubuntu-latest - steps: - - name: Keyscan - run: | - ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts + # steps: + # - name: Keyscan + # run: | + # ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts - - name: Checkout - uses: actions/checkout@v4 - with: - ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - ssh-strict: false - persist-credentials: false + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} + # ssh-strict: false + # persist-credentials: false - - name: Build - run: docker build -t chad-client -f ./client/Dockerfile.web ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} + # - name: Build + # run: docker build -t chad-client -f ./client/Dockerfile.web ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} - - name: Stop old container - run: docker rm -f chad-client || true + # - name: Stop old container + # run: docker rm -f chad-client || true - - name: Run - run: | - docker run -d \ - --name chad-client \ - --network traefik \ - --label "traefik.enable=true" \ - --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \ - --label "traefik.http.routers.chad-client.entrypoints=websecure" \ - --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \ - --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \ - chad-client:latest + # - name: Run + # run: | + # docker run -d \ + # --name chad-client \ + # --network traefik \ + # --label "traefik.enable=true" \ + # --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \ + # --label "traefik.http.routers.chad-client.entrypoints=websecure" \ + # --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \ + # --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \ + # chad-client:latest diff --git a/client/Dockerfile.windows b/client/Dockerfile.windows index 5939154..20cf359 100644 --- a/client/Dockerfile.windows +++ b/client/Dockerfile.windows @@ -8,9 +8,7 @@ RUN apt install -y curl unzip RUN curl -o- https://fnm.vercel.app/install | bash -RUN source /root/.bashrc - -RUN fnm install 24 +RUN ~/.local/share/fnm/fnm install 24 RUN corepack enable yarn RUN yarn set version stable