From ecda46cb11f3024a2017e76fb3dedfac1c1fe30f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Aug 2025 20:00:27 +0100 Subject: [PATCH] feat: add OCI labels to the dockerfiles (#79) --- .devcontainer/devcontainer.json | 4 +++- .github/workflows/action-prettier.yml | 1 + .github/workflows/action-super-linter.yml | 1 + .hadolint.yml | 2 ++ .vscode/extensions.json | 8 +++++++- Dockerfile.ubuntu-2004 | 13 ++++++++++++- Dockerfile.ubuntu-2204 | 13 ++++++++++++- Dockerfile.ubuntu-2404 | 13 ++++++++++++- README.md | 2 +- 9 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 .hadolint.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 43a2b01..ad08e67 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,8 @@ "ghcr.io/devcontainers-extra/features/shellcheck:1": {}, "ghcr.io/devcontainers-extra/features/yamllint:2": {}, "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}, - "ghcr.io/devcontainers/features/github-cli:1": {} + "ghcr.io/devcontainers/features/github-cli:1": {}, + "ghcr.io/dhoeric/features/hadolint:1": {} }, "customizations": { "vscode": { @@ -17,6 +18,7 @@ "DavidAnson.vscode-markdownlint", "editorconfig.editorconfig", "esbenp.prettier-vscode", + "exiasr.hadolint", "github.vscode-github-actions", "GitHub.vscode-pull-request-github", "ms-azuretools.vscode-containers", diff --git a/.github/workflows/action-prettier.yml b/.github/workflows/action-prettier.yml index f639bc9..8915985 100644 --- a/.github/workflows/action-prettier.yml +++ b/.github/workflows/action-prettier.yml @@ -1,5 +1,6 @@ name: Prettier on: + workflow_dispatch: push: branches: - "*" diff --git a/.github/workflows/action-super-linter.yml b/.github/workflows/action-super-linter.yml index 6ec6d59..8da1721 100644 --- a/.github/workflows/action-super-linter.yml +++ b/.github/workflows/action-super-linter.yml @@ -2,6 +2,7 @@ name: Super Linter on: + workflow_dispatch: push: branches: - "*" diff --git a/.hadolint.yml b/.hadolint.yml new file mode 100644 index 0000000..6fea026 --- /dev/null +++ b/.hadolint.yml @@ -0,0 +1,2 @@ +ignored: + - DL3008 # Pin versions in apt-get install diff --git a/.vscode/extensions.json b/.vscode/extensions.json index abd365b..fde4e2d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,13 @@ { "recommendations": [ + "DavidAnson.vscode-markdownlint", "editorconfig.editorconfig", "esbenp.prettier-vscode", - "github.vscode-github-actions" + "exiasr.hadolint", + "github.vscode-github-actions", + "GitHub.vscode-pull-request-github", + "ms-azuretools.vscode-containers", + "redhat.vscode-yaml", + "yzhang.markdown-all-in-one" ] } diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index 417a245..9e694cf 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -1,7 +1,18 @@ FROM ubuntu:20.04 -LABEL maintainer="LinuxGSM " ARG DEBIAN_FRONTEND=noninteractive +ARG BUILD_DATE +ARG VCS_REF + +LABEL maintainer="LinuxGSM " \ + org.opencontainers.image.title="SteamCMD" \ + org.opencontainers.image.description="SteamCMD headless image for acquiring dedicated server files" \ + org.opencontainers.image.url="https://github.com/GameServerManagers/docker-steamcmd" \ + org.opencontainers.image.source="https://github.com/GameServerManagers/docker-steamcmd" \ + org.opencontainers.image.vendor="GameServerManagers" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=$BUILD_DATE \ + org.opencontainers.image.revision=$VCS_REF SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index 5cb53ad..03d2f75 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -1,7 +1,18 @@ FROM ubuntu:22.04 -LABEL maintainer="LinuxGSM " ARG DEBIAN_FRONTEND=noninteractive +ARG BUILD_DATE +ARG VCS_REF + +LABEL maintainer="LinuxGSM " \ + org.opencontainers.image.title="SteamCMD" \ + org.opencontainers.image.description="SteamCMD headless image for acquiring dedicated server files" \ + org.opencontainers.image.url="https://github.com/GameServerManagers/docker-steamcmd" \ + org.opencontainers.image.source="https://github.com/GameServerManagers/docker-steamcmd" \ + org.opencontainers.image.vendor="GameServerManagers" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=$BUILD_DATE \ + org.opencontainers.image.revision=$VCS_REF SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404 index a73a433..decbfb5 100644 --- a/Dockerfile.ubuntu-2404 +++ b/Dockerfile.ubuntu-2404 @@ -1,7 +1,18 @@ FROM ubuntu:24.04 -LABEL maintainer="LinuxGSM " ARG DEBIAN_FRONTEND=noninteractive +ARG BUILD_DATE +ARG VCS_REF + +LABEL maintainer="LinuxGSM " \ + org.opencontainers.image.title="SteamCMD" \ + org.opencontainers.image.description="SteamCMD headless image for acquiring dedicated server files" \ + org.opencontainers.image.url="https://github.com/GameServerManagers/docker-steamcmd" \ + org.opencontainers.image.source="https://github.com/GameServerManagers/docker-steamcmd" \ + org.opencontainers.image.vendor="GameServerManagers" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=$BUILD_DATE \ + org.opencontainers.image.revision=$VCS_REF SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/README.md b/README.md index c419163..2b4de94 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ SteamCMD is a command-line version of the Steam client. It allows you to downloa ## Usage -docker cli +Docker cli ```bash docker run -it gameservermanagers/steamcmd:latest