peter/siftlode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci(deploy): pull the prebuilt published image in prod instead of building on host

Browse source 
The prod compose api service now references the published Forgejo image
(tag = released VERSION) and deploy.sh pulls it rather than running a host
build. The image carries its baked-in version/sha/build-date from publish.
This commit is contained in:
npeter83 2026-06-21 03:23:23 +02:00
parent e3b2917fe4
commit dbf0a95d5b
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
deploy/deploy.sh
View file

@ -2,10 +2,12 @@
# Roll out the latest main branch to the public VPS instance. # Roll out the latest main branch to the public VPS instance.
# #
# Layout on the host: # Layout on the host:
# /srv/siftlode/src git clone of this repo (build context + compose file) # /srv/siftlode/src git clone of this repo (compose file + VERSION)
# /srv/siftlode/.env secrets, mode 0600 (never in git) # /srv/siftlode/.env secrets, mode 0600 (never in git)
# #
# Build runs on the host Docker daemon, so it isn't constrained by the CI runner's memory. # The app is no longer built on the host — it's pulled as the prebuilt image published by
# `siftlode publish`. We still sync the repo to pick up the new compose file + VERSION (which
# selects the image tag to pull); the version/sha/build-date are baked into that image.
set -euo pipefail set -euo pipefail
ROOT=/srv/siftlode ROOT=/srv/siftlode
@ -15,11 +17,10 @@ git fetch --quiet origin
git checkout --quiet main git checkout --quiet main
git pull --ff-only --quiet git pull --ff-only --quiet
# Stamp the image with the version/commit being built (read by /api/version + the SPA). # The released version selects the published image tag to pull.
export APP_VERSION="$(cat VERSION 2>/dev/null || echo dev)" export APP_VERSION="$(cat VERSION 2>/dev/null || echo latest)"
export GIT_SHA="$(git rev-parse --short HEAD)"
export BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
docker compose -f docker-compose.prod.yml --env-file "$ROOT/.env" up -d --build docker compose -f docker-compose.prod.yml --env-file "$ROOT/.env" pull
docker compose -f docker-compose.prod.yml --env-file "$ROOT/.env" up -d
docker image prune -f >/dev/null || true docker image prune -f >/dev/null || true
docker compose -f docker-compose.prod.yml --env-file "$ROOT/.env" ps docker compose -f docker-compose.prod.yml --env-file "$ROOT/.env" ps

12
docker-compose.prod.yml
View file

@ -34,14 +34,10 @@ services:
restart: unless-stopped restart: unless-stopped
api: api:
build: # Prod pulls the prebuilt image published by `siftlode publish` instead of building on
context: . # the host. The tag follows the released VERSION (deploy.sh exports APP_VERSION); the
dockerfile: Dockerfile # image already carries the baked-in version/sha/build-date stamps from the publish build.
args: image: forge.b1fr0st.eu/peter/siftlode:${APP_VERSION:-latest}
APP_VERSION: ${APP_VERSION:-dev}
GIT_SHA: ${GIT_SHA:-unknown}
BUILD_DATE: ${BUILD_DATE:-}
image: siftlode-api:local
env_file: env_file:
- /srv/siftlode/.env - /srv/siftlode/.env
environment: environment: