From 62b790a751f2dda784d59d602091c4ba5203027d Mon Sep 17 00:00:00 2001
From: Tom <18158510+Ran-snow@users.noreply.github.com>
Date: Sat, 29 Oct 2022 22:22:20 +0800
Subject: [PATCH] updated gnupg

---
 .github/workflows/docker-publish.yml | 14 +++++++-------
 Dockerfile                           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ca10a5e..2a48056 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,40 +11,40 @@ jobs:
       contents: read
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Get tag name only
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Get downcase repo
         run: |
           echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Log in to GitHub Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push latest to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/nginx:latest
       - name: Build and Push tag to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/nginx:amd64-${{ env.RELEASE_VERSION }}
       - name: Build and Push latest to Git Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ghcr.io/${{ env.REPO }}/nginx:latest
       - name: Build and Push tag to Git Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ghcr.io/${{ env.REPO }}/nginx:amd64-${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 162ae99..752a8a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,7 @@ RUN GPG_KEYS_NGINX=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 		linux-headers \
 		curl \
 		git \
-		gnupg1 \
+		gnupg \
 		libxslt-dev \
 		gd-dev \
 		geoip-dev \