From c1664247cb67471d09617196088b058e7186febb Mon Sep 17 00:00:00 2001 From: patrikjuvonen <22572159+patrikjuvonen@users.noreply.github.com> Date: Thu, 8 Dec 2022 21:42:07 +0200 Subject: [PATCH] Remove stale labels --- .github/workflows/image.yml | 8 -------- Dockerfile | 10 ---------- README.md | 4 ++++ 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 8fdb8c4..dd7029d 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -15,11 +15,6 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Set Environment Variables - run: | - echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV - echo "VCS_REF=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - name: Docker meta id: meta uses: docker/metadata-action@v4 @@ -69,6 +64,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} labels: ${{ steps.meta.outputs.labels }} tags: ${{ steps.meta.outputs.tags }} - build-args: | - BUILD_DATE=${{ env.BUILD_DATE }} - VCS_REF=${{ env.VCS_REF }} diff --git a/Dockerfile b/Dockerfile index 160aa51..dd41410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,18 +19,12 @@ FROM alpine:edge AS builder -LABEL maintainer="Patrik Juvonen <22572159+patrikjuvonen@users.noreply.github.com>" - ENV NGINX_VERSION 1.23.2 ENV QUICHE_CHECKOUT 24a959abf115923910ce18985aa199d85fb602d7 ENV MODSEC_TAG v3/master ENV MODSEC_NGX_TAG master ENV NJS_TAG 0.7.9 -# Build-time metadata as defined at https://label-schema.org -ARG BUILD_DATE -ARG VCS_REF - RUN set -x; GPG_KEYS=13C82A63B603576156E30A4EA0EA981B66B0D967 \ && CONFIG="\ --prefix=/etc/nginx \ @@ -268,7 +262,3 @@ COPY modsec/* /etc/nginx/modsec/ STOPSIGNAL SIGTERM CMD ["nginx", "-g", "daemon off;"] - -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/patrikjuvonen/docker-nginx-http3.git" diff --git a/README.md b/README.md index 6725fb1..cace1c7 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,10 @@ Images for this are available on **GitHub Container Registry (GHCR):** `docker pull ghcr.io/patrikjuvonen/docker-nginx-http3` +Semantic versioning is enabled since 519e20d7f65d53b976cf7d13e364dca326e988b7, +the first semantic version being 2.0.0. You can use it with the tag `:2.0.0`, +`:2.0`, `:2` and so on. + This is a base image like the default _nginx_ image. It is meant to be used as a drop-in replacement for the nginx base image.