upgrade peter-evans/dockerhub-description@v4

chinayin-docker · Feb 22, 2024 · 65f7fc4 · 65f7fc4
1 parent b4adcd4
commit 65f7fc4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -14,9 +14,9 @@ jobs:
         run: |
           echo "repository=${GITHUB_ACTOR}/$(basename ${GITHUB_REPOSITORY})" >> $GITHUB_OUTPUT
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v3
+        uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
           repository: ${{ steps.vars.outputs.repository }}
           short-description: ${{ github.event.repository.description }}
diff --git a/1.21/bullseye-slim/Dockerfile → 1.25/bullseye-slim/Dockerfile b/1.21/bullseye-slim/Dockerfile → 1.25/bullseye-slim/Dockerfile
@@ -1,51 +1,46 @@
 #
 #
 #--------------------------------------------------------------------------
-# 1.21
+# 1.25
 #--------------------------------------------------------------------------
 #
 
-FROM chinayin/debian:bullseye-slim
+FROM chinayin/debian:bookworm-slim
 
 LABEL maintainer="Evan Wies <evan@neomantra.net>"
 
-ENV RESTY_VERSION 1.21.4.2
-
 # RESTY_DEB_FLAVOR build argument is used to select other
 # OpenResty Debian package variants.
 # For example: "-debug" or "-valgrind"
 ARG RESTY_DEB_FLAVOR=""
-ARG RESTY_DEB_VERSION="=1.21.4.2-1~bullseye1"
+ARG RESTY_DEB_VERSION="=1.25.3.1-2~bookworm1"
 ARG RESTY_APT_REPO="https://openresty.org/package/debian"
 ARG RESTY_APT_PGP="https://openresty.org/package/pubkey.gpg"
+ARG RESTY_APT_ARCH="amd64"
 ARG RESTY_IMAGE_BASE="debian"
-ARG RESTY_IMAGE_TAG="bullseye-slim"
+ARG RESTY_IMAGE_TAG="bookworm-slim"
 
 LABEL resty_image_base="${RESTY_IMAGE_BASE}"
 LABEL resty_image_tag="${RESTY_IMAGE_TAG}"
 LABEL resty_apt_repo="${RESTY_APT_REPO}"
 LABEL resty_apt_pgp="${RESTY_APT_PGP}"
+LABEL resty_apt_arch="${RESTY_APT_ARCH}"
 LABEL resty_deb_flavor="${RESTY_DEB_FLAVOR}"
 LABEL resty_deb_version="${RESTY_DEB_VERSION}"
 
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates \
-        gettext-base \
-        gnupg2 \
-        lsb-base \
-        lsb-release \
-        software-properties-common \
+        gnupg \
         wget \
-    && wget -qO /tmp/pubkey.gpg ${RESTY_APT_PGP} \
-    && DEBIAN_FRONTEND=noninteractive apt-key add /tmp/pubkey.gpg \
-    && rm /tmp/pubkey.gpg \
-    && DEBIAN_FRONTEND=noninteractive add-apt-repository -y "deb ${RESTY_APT_REPO} $(lsb_release -sc) openresty" \
+    && wget -qO - ${RESTY_APT_PGP} | gpg --dearmor > /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chown root:root /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod ugo+r /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod go-w /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && echo "deb [arch=$RESTY_APT_ARCH signed-by=/etc/apt/trusted.gpg.d/openresty-keyring.gpg] $RESTY_APT_REPO $(grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release) openresty" | tee /etc/apt/sources.list.d/openresty.list \
     && DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge \
-        gnupg2 \
-        lsb-release \
-        software-properties-common \
+        gnupg \
         wget \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \