fix: simplify ec2 deployment via repo zip
Deploy by zipping the repository, unpacking it on EC2, and running docker compose up --build --force-recreate with env from EC2_ENV to reduce pipeline complexity.
This commit is contained in:
talatops
parent
870e83877c
commit
d4d9f8baf0
93
.github/workflows/deploy-ec2.yml
vendored
93
.github/workflows/deploy-ec2.yml
vendored
@ -1,9 +1,6 @@
|
|||||||
name: build-deploy-junohub-ec2
|
name: build-deploy-junohub-ec2
|
||||||
|
|
||||||
env:
|
env:
|
||||||
IMAGE_NAME: junohub-app
|
|
||||||
IMAGE_TAG: ${{ github.sha }}
|
|
||||||
CONTAINER_NAME: junohub-app
|
|
||||||
REMOTE_DIR: /home/JUNO
|
REMOTE_DIR: /home/JUNO
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@ -24,89 +21,53 @@ jobs:
|
|||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Create deployment zip
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Prepare deployment env file
|
|
||||||
run: |
|
run: |
|
||||||
echo "IMAGE_NAME=${{ env.IMAGE_NAME }}" > .env
|
zip -r deploy.zip . \
|
||||||
echo "IMAGE_TAG=${{ env.IMAGE_TAG }}" >> .env
|
-x ".git/*" \
|
||||||
echo "CONTAINER_NAME=${{ env.CONTAINER_NAME }}" >> .env
|
".github/*" \
|
||||||
echo "NODE_ENV=production" >> .env
|
"node_modules/*" \
|
||||||
cat <<'EOF' >> .env
|
".next/*" \
|
||||||
${{ secrets.EC2_ENV }}
|
".turbo/*" \
|
||||||
EOF
|
"coverage/*" \
|
||||||
|
"docker/*"
|
||||||
- name: Build Docker image
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
file: Dockerfile
|
|
||||||
push: false
|
|
||||||
load: true
|
|
||||||
tags: |
|
|
||||||
${{ env.IMAGE_NAME }}:latest
|
|
||||||
${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
|
|
||||||
- name: Save Docker image tar
|
|
||||||
run: |
|
|
||||||
mkdir -p docker
|
|
||||||
docker save -o docker/junohub-app_${{ env.IMAGE_TAG }}.tar ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
|
|
||||||
|
|
||||||
- name: Setup SSH key
|
- name: Setup SSH key
|
||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.EC2_SSH_KEY }}" | tr -d '\r' > ssh_key.pem
|
echo "${{ secrets.EC2_SSH_KEY }}" | tr -d '\r' > ssh_key.pem
|
||||||
chmod 400 ssh_key.pem
|
chmod 400 ssh_key.pem
|
||||||
|
|
||||||
- name: Copy deployment files to EC2
|
- name: Copy deployment zip to EC2
|
||||||
run: |
|
run: |
|
||||||
ssh -i ssh_key.pem -o StrictHostKeyChecking=no ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} "mkdir -p '${{ env.REMOTE_DIR }}/prisma'"
|
ssh -i ssh_key.pem -o StrictHostKeyChecking=no ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} "mkdir -p '${{ env.REMOTE_DIR }}'"
|
||||||
scp -i ssh_key.pem -o StrictHostKeyChecking=no .env ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }}:${{ env.REMOTE_DIR }}/.env
|
scp -i ssh_key.pem -o StrictHostKeyChecking=no deploy.zip ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }}:${{ env.REMOTE_DIR }}/deploy.zip
|
||||||
scp -i ssh_key.pem -o StrictHostKeyChecking=no docker-compose.ec2.yml ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }}:${{ env.REMOTE_DIR }}/docker-compose.ec2.yml
|
|
||||||
scp -i ssh_key.pem -o StrictHostKeyChecking=no prisma/init-pgvector.sql ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }}:${{ env.REMOTE_DIR }}/prisma/init-pgvector.sql
|
|
||||||
scp -i ssh_key.pem -o StrictHostKeyChecking=no docker/junohub-app_${{ env.IMAGE_TAG }}.tar ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }}:${{ env.REMOTE_DIR }}/junohub-app_${{ env.IMAGE_TAG }}.tar
|
|
||||||
|
|
||||||
- name: Deploy on EC2 with docker compose
|
- name: Deploy on EC2 with docker compose
|
||||||
run: |
|
run: |
|
||||||
ssh -i ssh_key.pem -o StrictHostKeyChecking=no ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'ENDSSH'
|
ssh -i ssh_key.pem -o StrictHostKeyChecking=no ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'ENDSSH'
|
||||||
set -euxo pipefail
|
set -e
|
||||||
cd ${{ env.REMOTE_DIR }}
|
cd ${{ env.REMOTE_DIR }}
|
||||||
echo "=== BEFORE DEPLOY ==="
|
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env ps || true
|
|
||||||
docker ps -a --filter "name=juno-app-1" --format "table {{.ID}}\t{{.Image}}\t{{.Status}}\t{{.Names}}" || true
|
|
||||||
|
|
||||||
docker load -i junohub-app_${{ env.IMAGE_TAG }}.tar
|
# Unpack latest code snapshot over deploy directory
|
||||||
rm -f junohub-app_${{ env.IMAGE_TAG }}.tar
|
unzip -oq deploy.zip -d .
|
||||||
echo "Loaded new image tar successfully"
|
rm -f deploy.zip
|
||||||
|
|
||||||
echo "=== START DB / ENSURE EXTENSION ==="
|
# Recreate .env from secret for runtime values
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env up -d --remove-orphans db
|
cat > .env << 'ENVFILE'
|
||||||
echo "DB up command completed"
|
${{ secrets.EC2_ENV }}
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env exec -T db sh -lc "psql -U \"\${POSTGRES_USER:-postgres}\" -d \"\${POSTGRES_DB:-dropshipping}\" -c \"CREATE EXTENSION IF NOT EXISTS vector;\""
|
ENVFILE
|
||||||
echo "Vector extension check completed"
|
|
||||||
|
|
||||||
# Stop and replace app container only (no volume removal)
|
# Build and run services from current source
|
||||||
echo "=== REPLACE APP CONTAINER ==="
|
docker compose -f docker-compose.yml --env-file .env up -d --build --force-recreate --remove-orphans
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env stop app || true
|
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env rm -f app || true
|
|
||||||
# Fallback in case old container is detached from compose state but still running with the canonical name.
|
|
||||||
docker rm -f juno-app-1 2>/dev/null || true
|
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env up -d --no-deps --remove-orphans app
|
|
||||||
echo "App replace command completed"
|
|
||||||
|
|
||||||
echo "=== AFTER DEPLOY ==="
|
# Ensure pgvector extension exists for Prisma vector type
|
||||||
docker compose -f docker-compose.ec2.yml --env-file .env ps
|
docker compose -f docker-compose.yml --env-file .env exec -T db sh -lc "psql -U \"\${POSTGRES_USER:-postgres}\" -d \"\${POSTGRES_DB:-dropshipping}\" -c \"CREATE EXTENSION IF NOT EXISTS vector;\""
|
||||||
docker ps -a --filter "name=juno-app-1" --format "table {{.ID}}\t{{.Image}}\t{{.Status}}\t{{.Names}}"
|
|
||||||
APP_ID="$(docker compose -f docker-compose.ec2.yml --env-file .env ps -q app)"
|
docker compose -f docker-compose.yml --env-file .env ps
|
||||||
echo "App container details:"
|
|
||||||
docker inspect --format='id={{.Id}} startedAt={{.State.StartedAt}} image={{.Config.Image}}' "$APP_ID"
|
|
||||||
ENDSSH
|
ENDSSH
|
||||||
|
|
||||||
- name: Cleanup local artifacts
|
- name: Cleanup local artifacts
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
rm -f ssh_key.pem
|
rm -f ssh_key.pem
|
||||||
rm -f .env
|
rm -f deploy.zip
|
||||||
rm -f docker/*.tar || true
|
|
||||||
Loading…
Reference in New Issue
Block a user