diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 46928b34..190785d9 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -16,18 +16,7 @@ jobs: - name: Install tools run: | apt-get update - apt-get install -y \ - docker.io \ - openssh-client \ - rsync \ - qemu-user-static \ - binfmt-support - - - name: Set up Docker Buildx - run: | - # Create and use a new builder instance with the latest features - docker buildx create --name multiarch-builder --driver docker-container --use - docker buildx inspect --bootstrap + apt-get install -y docker.io openssh-client - name: Login to registry env: @@ -36,18 +25,16 @@ jobs: run: | echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me -u "$REGISTRY_USER" --password-stdin - - name: Build and push multi-arch image + - name: Build and push ARM64 image run: | - # Build for both AMD64 and ARM64 simultaneously and push directly - docker buildx build \ - --platform linux/amd64,linux/arm64 \ + docker build \ --pull \ --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} \ --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} \ --build-arg NEXT_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ -t registry.infra.mintel.me/mintel/klz-cables.com:latest \ - --push \ . + docker push registry.infra.mintel.me/mintel/klz-cables.com:latest - name: Setup SSH run: | @@ -58,30 +45,22 @@ jobs: - name: Deploy on server run: | - # Bundle files and secrets, then run deployment in ONE connection tar czf - docker-compose.yml varnish 2>/dev/null | \ - ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me " + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no deploy@alpha.mintel.me " set -e mkdir -p /home/deploy/sites/klz-cables.com/ tar xzf - -C /home/deploy/sites/klz-cables.com/ cd /home/deploy/sites/klz-cables.com/ - echo '=== Creating .env ===' - cat > .env << EOF - NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} - NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} - SENTRY_DSN=${{ secrets.SENTRY_DSN }} - REDIS_URL=${{ secrets.REDIS_URL }} - REDIS_KEY_PREFIX=${{ secrets.REDIS_KEY_PREFIX }} - EOF + cat > .env << 'EOF' +NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} +NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} +SENTRY_DSN=${{ secrets.SENTRY_DSN }} +REDIS_URL=${{ secrets.REDIS_URL }} +REDIS_KEY_PREFIX=${{ secrets.REDIS_KEY_PREFIX }} +EOF - echo '=== Login & Pull ===' echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin docker pull registry.infra.mintel.me/mintel/klz-cables.com:latest - - echo '=== Run ===' - # Force recreate ensures the new image is used docker compose up -d --force-recreate --remove-orphans - - echo '=== Done ===' "