diff --git a/Dockerfile b/Dockerfile index 91a0c7c..e451fa2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ ARG RUBY_VERSION=3.4.7 ARG NODE_VERSION=22.16.0 ARG BUN_VERSION=1.3.9 +ARG GIT_REV=unknown # --- Stage 1: Grab Node.js Binaries --- # We use the official image as a source for pre-compiled binaries @@ -78,8 +79,11 @@ RUN groupadd --system --gid 1000 rails && \ useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \ chown -R rails:rails db log tmp public -# Create versioninfo with build timestamp -RUN date +"%Y-%m-%d %H:%M:%S %Z" > public/versioninfo +# Redeclare so it is in scope in this final stage +ARG GIT_REV=unknown + +# Create versioninfo with git revision and build timestamp +RUN printf 'git-rev: %s\nbuilt-at: %s\n' "$GIT_REV" "$(date +'%Y-%m-%d %H:%M:%S %Z')" > public/versioninfo USER 1000:1000 diff --git a/Makefile b/Makefile index b83b2e3..9c165cd 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ -include .env.production .env.development -REGISTRY := registry.coolify1.workaround.org +REGISTRY := git.workaround.org/chaas -stage: TAG=stage +stage: TAG=latest stage: build tag push curl -s -H "Authorization: Bearer $(COOLIFY_STAGE_DEPLOY_TOKEN)" \ -X POST "$(COOLIFY_STAGE_DEPLOY_WEBHOOK)" @@ -15,10 +15,11 @@ prod: build tag push -X POST "$(COOLIFY_PROD_DEPLOY_WEBHOOK)" build: - podman build -t debshots-$(TAG) . + docker build --build-arg GIT_REV=$(git rev-parse --short HEAD) -t debshots-$(TAG) . tag: - podman tag debshots-$(TAG) $(REGISTRY)/debshots-web:$(TAG) + docker tag debshots-$(TAG) $(REGISTRY)/debshots:$(TAG) push: - podman push $(REGISTRY)/debshots-web:$(TAG) + docker push $(REGISTRY)/debshots:$(TAG) +