This commit is contained in:
2026-01-25 17:38:56 +01:00
parent 28a1cb4b4c
commit f5edc08e9d

View File

@@ -16,18 +16,7 @@ jobs:
- name: Install tools - name: Install tools
run: | run: |
apt-get update apt-get update
apt-get install -y \ apt-get install -y docker.io openssh-client
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
- name: Login to registry - name: Login to registry
env: env:
@@ -36,18 +25,16 @@ jobs:
run: | run: |
echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me -u "$REGISTRY_USER" --password-stdin 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: | run: |
# Build for both AMD64 and ARM64 simultaneously and push directly docker build \
docker buildx build \
--platform linux/amd64,linux/arm64 \
--pull \ --pull \
--build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} \ --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_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} \
--build-arg NEXT_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ --build-arg NEXT_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
-t registry.infra.mintel.me/mintel/klz-cables.com:latest \ -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 - name: Setup SSH
run: | run: |
@@ -58,30 +45,22 @@ jobs:
- name: Deploy on server - name: Deploy on server
run: | run: |
# Bundle files and secrets, then run deployment in ONE connection
tar czf - docker-compose.yml varnish 2>/dev/null | \ 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 set -e
mkdir -p /home/deploy/sites/klz-cables.com/ mkdir -p /home/deploy/sites/klz-cables.com/
tar xzf - -C /home/deploy/sites/klz-cables.com/ tar xzf - -C /home/deploy/sites/klz-cables.com/
cd /home/deploy/sites/klz-cables.com/ cd /home/deploy/sites/klz-cables.com/
echo '=== Creating .env ===' cat > .env << 'EOF'
cat > .env << EOF NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }}
NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} SENTRY_DSN=${{ secrets.SENTRY_DSN }}
SENTRY_DSN=${{ secrets.SENTRY_DSN }} REDIS_URL=${{ secrets.REDIS_URL }}
REDIS_URL=${{ secrets.REDIS_URL }} REDIS_KEY_PREFIX=${{ secrets.REDIS_KEY_PREFIX }}
REDIS_KEY_PREFIX=${{ secrets.REDIS_KEY_PREFIX }} EOF
EOF
echo '=== Login & Pull ==='
echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin 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 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 docker compose up -d --force-recreate --remove-orphans
echo '=== Done ==='
" "