Skip to content

Commit

Permalink
Merge pull request #647 from nginx-proxy/dockerfile-rules
Browse files Browse the repository at this point in the history
build: apply Dockerfile rules
  • Loading branch information
buchdag committed Sep 9, 2024
2 parents 54aace6 + 7559e1b commit 4001821
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DOCKER_GEN_VERSION=main

# Build docker-gen from scratch
FROM --platform=$BUILDPLATFORM golang:1.23.1-alpine as go-builder
FROM --platform=$BUILDPLATFORM golang:1.23.1-alpine AS go-builder

ENV CGO_ENABLED=0

Expand All @@ -24,7 +24,7 @@ RUN set -eux; \
go env | grep -E 'OS=|ARCH=|ARM=|AMD64='; \
go build -ldflags "-X main.buildVersion=${DOCKER_GEN_VERSION}" -o docker-gen ./cmd/docker-gen

FROM --platform=$TARGETPLATFORM alpine:3.20.3
FROM alpine:3.20.3

ARG DOCKER_GEN_VERSION
ENV DOCKER_GEN_VERSION=${DOCKER_GEN_VERSION} \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DOCKER_GEN_VERSION=main

# Build docker-gen from scratch
FROM --platform=$BUILDPLATFORM golang:1.23.1 as go-builder
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS go-builder

ENV CGO_ENABLED=0

Expand All @@ -24,7 +24,7 @@ RUN set -eux; \
go env | grep -E 'OS=|ARCH=|ARM=|AMD64='; \
go build -ldflags "-X main.buildVersion=${DOCKER_GEN_VERSION}" -o docker-gen ./cmd/docker-gen

FROM --platform=$TARGETPLATFORM debian:12.7-slim
FROM debian:12.7-slim

ARG DOCKER_GEN_VERSION
ENV DOCKER_GEN_VERSION=${DOCKER_GEN_VERSION} \
Expand Down

0 comments on commit 4001821

Please sign in to comment.