Skip to content

Commit 589c274

Browse files
authored
Merge pull request #123 from nginxinc/chore/remove-replace
Remove unneeded Plus version
2 parents 76d45f9 + 3cc61bb commit 589c274

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
sed -i '16d' docker/Dockerfile
4444
sed -i "17i sed -i 's|pkgs|pkgs-test|g' /etc/apt/apt.conf.d/90pkgs-nginx" docker/Dockerfile
4545
sed -i 's|deb https|deb [trusted=yes] https|g' docker/Dockerfile
46-
sed -i 's|nginx-plus-\${NGINX_PLUS_VERSION}|nginx-plus|g' docker/Dockerfile
4746
sed -i 's|\${NGINX_PLUS_VERSION^^}/||g' docker/Dockerfile
4847
- name: Set up Docker Buildx
4948
uses: docker/setup-buildx-action@v2

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
1818
DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release)
1919
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
2020
apt-get update
21-
apt-get install -y nginx-plus-${NGINX_PLUS_VERSION}
21+
apt-get install -y nginx-plus
2222
apt-get remove --purge --auto-remove -y gnupg
2323
rm -rf /var/lib/apt/lists/*
2424
rm /etc/apt/apt.conf.d/90pkgs-nginx /etc/apt/sources.list.d/nginx-plus.list

0 commit comments

Comments
 (0)