diff --git a/1/debian11/1.20/Dockerfile b/1/debian11/1.20/Dockerfile deleted file mode 100644 index e085e8d..0000000 --- a/1/debian11/1.20/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM marketplace.gcr.io/google/c2d-debian11 - -ENV NGINX_VERSION 1.20.2* -ENV C2D_RELEASE 1.20.2 - -ENV ENABLE_STUB_STATUS false - -RUN set -x \ - && apt-get update \ - && apt-get install -y \ - dirmngr \ - gnupg \ - wget \ - libtasn1-6 \ - && rm -rf /var/lib/apt/lists/* - -RUN set -x \ - && echo "deb http://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list \ - && wget http://nginx.org/packages/keys/nginx_signing.key \ - && apt-key add nginx_signing.key \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ca-certificates \ - nginx=${NGINX_VERSION} \ - nginx-module-xslt=${NGINX_VERSION} \ - nginx-module-geoip=${NGINX_VERSION} \ - nginx-module-image-filter=${NGINX_VERSION} \ - nginx-module-perl=${NGINX_VERSION} \ - nginx-module-njs=${NGINX_VERSION} \ - gettext-base \ - && rm -rf /var/lib/apt/lists/* - -# forward request and error logs to docker log collector -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log - -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -COPY stub.conf /etc/nginx/stub.conf.template - -RUN chmod +rx /usr/local/bin/docker-entrypoint.sh - -EXPOSE 80 443 8080 - -ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/1/debian11/1.20/docker-entrypoint.sh b/1/debian11/1.20/docker-entrypoint.sh deleted file mode 100644 index 6039f88..0000000 --- a/1/debian11/1.20/docker-entrypoint.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# Copyright 2015 The Kubernetes Authors. -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -if [[ "${ENABLE_STUB_STATUS}" == "true" ]]; then - declare -r stub_config="/etc/nginx/conf.d/stub.conf" - - mv -f /etc/nginx/stub.conf.template "${stub_config}" - if [[ "${ENABLE_STUB_ALL_HOSTS}" == "true" ]]; then - sed -i 's/127.0.0.1/0.0.0.0/g' "${stub_config}" - sed -i '/deny all;/d' "${stub_config}" - fi -fi - -exec /usr/sbin/nginx -g "daemon off;" diff --git a/1/debian11/1.20/stub.conf b/1/debian11/1.20/stub.conf deleted file mode 100644 index 4f4d15a..0000000 --- a/1/debian11/1.20/stub.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 8080; - location /stub_status { - stub_status on; - access_log off; - allow 127.0.0.1; - deny all; - } -} diff --git a/1/debian11/1.22/Dockerfile b/1/debian11/1.22/Dockerfile deleted file mode 100644 index 4cd153b..0000000 --- a/1/debian11/1.22/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM marketplace.gcr.io/google/c2d-debian11 - -ENV NGINX_VERSION 1.22.0* -ENV C2D_RELEASE 1.22.0 - -ENV ENABLE_STUB_STATUS false - -RUN set -x \ - && apt-get update \ - && apt-get install -y \ - dirmngr \ - gnupg \ - wget \ - libtasn1-6 \ - && rm -rf /var/lib/apt/lists/* - -RUN set -x \ - && echo "deb http://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list \ - && wget http://nginx.org/packages/keys/nginx_signing.key \ - && apt-key add nginx_signing.key \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ca-certificates \ - nginx=${NGINX_VERSION} \ - nginx-module-xslt=${NGINX_VERSION} \ - nginx-module-geoip=${NGINX_VERSION} \ - nginx-module-image-filter=${NGINX_VERSION} \ - nginx-module-perl=${NGINX_VERSION} \ - nginx-module-njs=${NGINX_VERSION} \ - gettext-base \ - && rm -rf /var/lib/apt/lists/* - -# forward request and error logs to docker log collector -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log - -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -COPY stub.conf /etc/nginx/stub.conf.template - -RUN chmod +rx /usr/local/bin/docker-entrypoint.sh - -EXPOSE 80 443 8080 - -ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/1/debian11/1.22/docker-entrypoint.sh b/1/debian11/1.22/docker-entrypoint.sh deleted file mode 100644 index 6039f88..0000000 --- a/1/debian11/1.22/docker-entrypoint.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# Copyright 2015 The Kubernetes Authors. -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -if [[ "${ENABLE_STUB_STATUS}" == "true" ]]; then - declare -r stub_config="/etc/nginx/conf.d/stub.conf" - - mv -f /etc/nginx/stub.conf.template "${stub_config}" - if [[ "${ENABLE_STUB_ALL_HOSTS}" == "true" ]]; then - sed -i 's/127.0.0.1/0.0.0.0/g' "${stub_config}" - sed -i '/deny all;/d' "${stub_config}" - fi -fi - -exec /usr/sbin/nginx -g "daemon off;" diff --git a/1/debian11/1.22/stub.conf b/1/debian11/1.22/stub.conf deleted file mode 100644 index 4f4d15a..0000000 --- a/1/debian11/1.22/stub.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 8080; - location /stub_status { - stub_status on; - access_log off; - allow 127.0.0.1; - deny all; - } -} diff --git a/1/debian11/1.23/Dockerfile b/1/debian11/1.23/Dockerfile index 0013c49..bad1a32 100644 --- a/1/debian11/1.23/Dockerfile +++ b/1/debian11/1.23/Dockerfile @@ -15,7 +15,7 @@ RUN set -x \ && rm -rf /var/lib/apt/lists/* RUN set -x \ - && echo "deb http://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list \ + && echo "deb http://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list \ && wget http://nginx.org/packages/keys/nginx_signing.key \ && apt-key add nginx_signing.key \ && apt-get update \ diff --git a/versions.yaml b/versions.yaml index f80d5d3..fa2a47c 100644 --- a/versions.yaml +++ b/versions.yaml @@ -39,40 +39,6 @@ versions: - '1.23' - '1' - latest - templateArgs: - os: bullseye - repo: http://nginx.org/packages/mainline/debian/ - templateSubDir: nginx -- dir: 1/debian11/1.22 - excludeTests: - - tests/functional_tests/exporter_test.yaml - from: marketplace.gcr.io/google/c2d-debian11 - packages: - nginx: - version: 1.22.0 - repo: nginx1 - tags: - - 1.22.0-debian11 - - 1.22-debian11 - - 1.22.0 - - '1.22' - templateArgs: - os: bullseye - repo: http://nginx.org/packages/debian/ - templateSubDir: nginx -- dir: 1/debian11/1.20 - excludeTests: - - tests/functional_tests/exporter_test.yaml - from: marketplace.gcr.io/google/c2d-debian11 - packages: - nginx: - version: 1.20.2 - repo: nginx1 - tags: - - 1.20.2-debian11 - - 1.20-debian11 - - 1.20.2 - - '1.20' templateArgs: os: bullseye repo: http://nginx.org/packages/debian/