Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.

Docker: bump golang and add proper maintainers lines #1639

Merged
merged 3 commits into from
Aug 18, 2025
Merged

Docker: bump golang and add proper maintainers lines #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf2a005
Docker: removed golang 1.23, added golang 1.25.
thresheek Aug 18, 2025
17ba6cd
Docker: specify real names and handles of Maintainers.
thresheek Aug 18, 2025
2e30fc3
Regenerated dockerfiles.
thresheek Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.go1.23 → pkg/docker/Dockerfile.go1.25
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.23-bookworm
FROM golang:1.25-bookworm

LABEL org.opencontainers.image.title="Unit (go1.23)"
LABEL org.opencontainers.image.title="Unit (go1.25)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
Expand Down
6 changes: 4 additions & 2 deletions pkg/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ INSTALL_minimal ?= version
RUN_minimal ?= /bin/true
MODULE_PREBUILD_minimal ?= /bin/true

VERSIONS_go ?= 1.23 1.24
VERSIONS_go ?= 1.24 1.25
VARIANT_go ?= $(VARIANT)
$(foreach goversion, $(VERSIONS_go), $(eval CONTAINER_go$(goversion) = golang:$(goversion)-$(VARIANT_go)))
CONFIGURE_go ?= go --go-path=$$GOPATH
Expand Down Expand Up @@ -121,7 +121,9 @@ build-%: Dockerfile.%
library:
@echo "# this file is generated via https://github.com/nginx/unit/blob/$(shell git rev-parse HEAD)/pkg/docker/Makefile"
@echo ""
@echo "Maintainers: Unit Docker Maintainers <docker-maint@nginx.com> (@nginx)"
@echo "Maintainers: Unit Docker Maintainers <docker-maint@nginx.com> (@nginx),"
@echo " Konstantin Pavlov (@thresheek),"
@echo " Igor Ippolitov (@oxpa)"
@echo "GitRepo: https://github.com/nginx/unit.git"
@previous=""; \
for mod in $(MODVERSIONS); do \
Expand Down