Stamp the git commit into images built from the Dockerfile (closes #236)
.dockerignore left out .git, so `make build` in the image found no git metadata and stamped `dev`. It now sends .git, and no longer leaves out tracked files (LICENSE, README.md, ...), which git would see as deleted and mark the version -dirty. The footer, startup log and /health already read the same version; the README says to build from a git clone. Model: opus-5-5
This commit is contained in:
+3
-6
@@ -1,11 +1,8 @@
|
|||||||
.git
|
# .git is sent so that `make build` in the Dockerfile can stamp the commit into
|
||||||
|
# upaas. List no tracked file here: git would see it as deleted in the build and
|
||||||
|
# the version would end in -dirty.
|
||||||
.env
|
.env
|
||||||
bin/
|
bin/
|
||||||
.editorconfig
|
|
||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
*.test
|
*.test
|
||||||
LICENSE
|
|
||||||
CONVENTIONS.md
|
|
||||||
REPO_POLICIES.md
|
|
||||||
README.md
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ RUN go mod download
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN make test
|
RUN make test
|
||||||
|
# Takes the version from `git describe` on the .git copied in above.
|
||||||
RUN make build
|
RUN make build
|
||||||
|
|
||||||
# Runtime stage
|
# Runtime stage
|
||||||
|
|||||||
@@ -226,6 +226,10 @@ This recipe serves plain HTTP, so `UPAAS_PLAINTEXT_HTTP=true` is required for
|
|||||||
setup and every other form to pass the CSRF origin check. Behind a
|
setup and every other form to pass the CSRF origin check. Behind a
|
||||||
TLS-terminating reverse proxy, drop that line.
|
TLS-terminating reverse proxy, drop that line.
|
||||||
|
|
||||||
|
The image shows the commit it was built from (the `git describe` output) in the
|
||||||
|
page footer, the startup log and `/health`. Build it from a git clone: without
|
||||||
|
the `.git` directory it shows `dev`.
|
||||||
|
|
||||||
### Deploying with Docker Compose
|
### Deploying with Docker Compose
|
||||||
|
|
||||||
[`docker-compose.yml`](docker-compose.yml) builds the image from this repo and
|
[`docker-compose.yml`](docker-compose.yml) builds the image from this repo and
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ regress.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 2026-09-29: An image built from the `Dockerfile` now shows the commit it was
|
||||||
|
built from (the `git describe` output) in the footer, the startup log and
|
||||||
|
`/health` instead of `dev`: `.dockerignore` no longer leaves out `.git`, nor
|
||||||
|
any tracked file, which git would count as deleted and mark `-dirty` (#236).
|
||||||
|
|
||||||
- 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
|
- 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
|
||||||
`PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
|
`PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
|
||||||
it listen away from the port mapping and healthcheck; the README's Compose
|
it listen away from the port mapping and healthcheck; the README's Compose
|
||||||
|
|||||||
Reference in New Issue
Block a user