Skip to content

Commit

Permalink
deb,rpm: fix Dockerfile default value for ARG linting warnings
Browse files Browse the repository at this point in the history
The `GO_IMAGE` build-arg doesn't have a default;

     - InvalidDefaultArgInFrom: Default value for ARG ${GO_IMAGE} results in empty or invalid base image name (line 8)

This is not a real issue when building using the Makefiles (which is how
these Dockerfiles are expected to be used) but we can probably set a
default.

This patch sets the default to `golang:latest` to pick the latest version,
which should be fine for this (until we get a linter recommending not
to use `:latest`).

Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
thaJeztah committed Sep 4, 2024
1 parent 3a7bbe7 commit 9c73210
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion deb/debian-bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=debian
ARG SUITE=bookworm
ARG VERSION_ID=12
Expand Down
2 changes: 1 addition & 1 deletion deb/debian-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=debian
ARG SUITE=bullseye
ARG VERSION_ID=11
Expand Down
2 changes: 1 addition & 1 deletion deb/raspbian-bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=raspbian
ARG SUITE=bookworm
ARG VERSION_ID=12
Expand Down
2 changes: 1 addition & 1 deletion deb/raspbian-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=raspbian
ARG SUITE=bullseye
ARG VERSION_ID=11
Expand Down
2 changes: 1 addition & 1 deletion deb/ubuntu-focal/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=ubuntu
ARG SUITE=focal
ARG VERSION_ID=20.04
Expand Down
2 changes: 1 addition & 1 deletion deb/ubuntu-jammy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=ubuntu
ARG SUITE=jammy
ARG VERSION_ID=22.04
Expand Down
2 changes: 1 addition & 1 deletion deb/ubuntu-noble/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=ubuntu
ARG SUITE=noble
ARG VERSION_ID=24.04
Expand Down
2 changes: 1 addition & 1 deletion rpm/centos-9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=centos
ARG SUITE=9
ARG BUILD_IMAGE=quay.io/centos/${DISTRO}:stream${SUITE}
Expand Down
2 changes: 1 addition & 1 deletion rpm/fedora-39/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=fedora
ARG SUITE=39
ARG BUILD_IMAGE=${DISTRO}:${SUITE}
Expand Down
2 changes: 1 addition & 1 deletion rpm/fedora-40/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=fedora
ARG SUITE=40
ARG BUILD_IMAGE=${DISTRO}:${SUITE}
Expand Down
2 changes: 1 addition & 1 deletion rpm/rhel-8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=rhel
ARG SUITE=8
ARG BUILD_IMAGE=registry.access.redhat.com/ubi8/ubi
Expand Down
2 changes: 1 addition & 1 deletion rpm/rhel-9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_IMAGE
ARG GO_IMAGE=golang:latest
ARG DISTRO=rhel
ARG SUITE=9
ARG BUILD_IMAGE=registry.access.redhat.com/ubi9/ubi
Expand Down

0 comments on commit 9c73210

Please sign in to comment.