Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dependabot/pip/test/requirements/pytest-7.2.2

Browse source
This commit is contained in:
Hannes 2024-02-06 21:09:23 +01:00 committed by GitHub
commit df6ebf88a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -3,7 +3,7 @@ ARG DOCKER_GEN_VERSION=0.9.0
ARG FOREGO_VERSION=v0.17.0
# Use a specific version of golang to build both binaries
FROM golang:1.18.1 as gobuilder
FROM golang:1.20.1 as gobuilder
# Build docker-gen from scratch
FROM gobuilder as dockergen
@ -36,7 +36,7 @@ RUN git clone https://github.com/nginx-proxy/forego/ \
&& rm -rf /go/forego
# Build the final image
FROM nginx:1.21.6
FROM nginx:1.23.3
ARG NGINX_PROXY_VERSION
# Add DOCKER_GEN_VERSION environment variable

4
Dockerfile.alpine
View file

@ -3,7 +3,7 @@ ARG DOCKER_GEN_VERSION=0.9.0
ARG FOREGO_VERSION=v0.17.0
# Use a specific version of golang to build both binaries
FROM golang:1.18.1-alpine as gobuilder
FROM golang:1.20.1-alpine as gobuilder
RUN apk add --no-cache git musl-dev
# Build docker-gen from scratch
@ -37,7 +37,7 @@ RUN git clone https://github.com/nginx-proxy/forego/ \
&& rm -rf /go/forego
# Build the final image
FROM nginx:1.21.6-alpine
FROM nginx:1.23.3-alpine
ARG NGINX_PROXY_VERSION
# Add DOCKER_GEN_VERSION environment variable

2
test/requirements/python-requirements.txt
View file

@ -1,4 +1,4 @@
backoff==1.11.1
backoff==2.2.1
docker-compose==1.29.2
docker==5.0.3
pytest==7.2.2