diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3c124d2..79c8707e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,6 @@ jobs: sed -i '16d' docker/Dockerfile sed -i "17i sed -i 's|pkgs|pkgs-test|g' /etc/apt/apt.conf.d/90pkgs-nginx" docker/Dockerfile sed -i 's|deb https|deb [trusted=yes] https|g' docker/Dockerfile - sed -i 's|nginx-plus-\${NGINX_PLUS_VERSION}|nginx-plus|g' docker/Dockerfile sed -i 's|\${NGINX_PLUS_VERSION^^}/||g' docker/Dockerfile - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/docker/Dockerfile b/docker/Dockerfile index c2248e44..9464155a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,7 +18,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) printf "%s\n" "deb https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION^^}/debian ${DEBIAN_VERSION} nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list apt-get update - apt-get install -y nginx-plus-${NGINX_PLUS_VERSION} + apt-get install -y nginx-plus apt-get remove --purge --auto-remove -y gnupg rm -rf /var/lib/apt/lists/* rm /etc/apt/apt.conf.d/90pkgs-nginx /etc/apt/sources.list.d/nginx-plus.list