Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7bee66ee17 | ||
|
|
a48d90f5ea |
+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
|
||||||
|
|||||||
@@ -27,6 +27,12 @@ regress.
|
|||||||
Compose section says to update with `docker compose up -d --build` and names
|
Compose section says to update with `docker compose up -d --build` and names
|
||||||
the Docker Engine versions builds need (#234).
|
the Docker Engine versions builds need (#234).
|
||||||
|
|
||||||
|
- 2026-09-29: An image built from the `Dockerfile` now shows the commit it was
|
||||||
|
built from (the `git describe` output) in the footer and `/health` instead of
|
||||||
|
`dev`: `.dockerignore` no longer leaves out `.git`, nor any tracked file,
|
||||||
|
which git would count as deleted and mark `-dirty`. upaas now also logs its
|
||||||
|
version at startup; the logger's `Identify()` was never called (#236).
|
||||||
|
|
||||||
- 2026-09-29: The app page shows the app's branch as a label in its title, next
|
- 2026-09-29: The app page shows the app's branch as a label in its title, next
|
||||||
to the status badge, instead of after the repository under it (#240).
|
to the status badge, instead of after the repository under it (#240).
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -52,6 +52,8 @@ func main() {
|
|||||||
handlers.New,
|
handlers.New,
|
||||||
server.New,
|
server.New,
|
||||||
),
|
),
|
||||||
fx.Invoke(func(*server.Server) {}),
|
fx.Invoke(func(log *logger.Logger, _ *server.Server) {
|
||||||
|
log.Identify()
|
||||||
|
}),
|
||||||
).Run()
|
).Run()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user