1 Commits
Author SHA1 Message Date
sneak 2102a248b2 Merge next into main: every setting upaas reads in the README, UPAAS_PORT in the Compose file (#232)
Check / check (push) Successful in 6s
Reviewed-on: #232
2026-09-29 07:51:56 +02:00
5 changed files with 7 additions and 17 deletions
+6 -3
View File
@@ -1,8 +1,11 @@
# .git is sent so that `make build` in the Dockerfile can stamp the commit into .git
# 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
-1
View File
@@ -31,7 +31,6 @@ 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
-4
View File
@@ -226,10 +226,6 @@ 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
-6
View File
@@ -20,12 +20,6 @@ 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 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: `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
+1 -3
View File
@@ -52,8 +52,6 @@ func main() {
handlers.New, handlers.New,
server.New, server.New,
), ),
fx.Invoke(func(log *logger.Logger, _ *server.Server) { fx.Invoke(func(*server.Server) {}),
log.Identify()
}),
).Run() ).Run()
} }