From b81aa58aa639e45779737ffb384d5ad9166aaa59 Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Thu, 8 Feb 2024 09:28:43 +0000 Subject: [PATCH 1/3] Nginx version updated to 1.25.3 and exporter to 0.14.0 --- 1/debian11/1.25/Dockerfile | 4 ++-- exporter/Dockerfile | 2 +- versions.yaml | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/1/debian11/1.25/Dockerfile b/1/debian11/1.25/Dockerfile index fe74e85..44b9b04 100644 --- a/1/debian11/1.25/Dockerfile +++ b/1/debian11/1.25/Dockerfile @@ -1,7 +1,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 -ENV NGINX_VERSION 1.25.2* -ENV C2D_RELEASE 1.25.2 +ENV NGINX_VERSION 1.25.3* +ENV C2D_RELEASE 1.25.3 ENV ENABLE_STUB_STATUS false diff --git a/exporter/Dockerfile b/exporter/Dockerfile index 6fc996c..6a25518 100644 --- a/exporter/Dockerfile +++ b/exporter/Dockerfile @@ -1,6 +1,6 @@ FROM marketplace.gcr.io/google/c2d-debian11 -ENV EXPORTER_VERSION 0.11.0 +ENV EXPORTER_VERSION 0.14.0 COPY licenses/ /usr/share/doc/ diff --git a/versions.yaml b/versions.yaml index 3f43504..e0123e3 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Redistribution and use in source and binary forms, with or without modification, are permitted # provided that the following conditions are met: @@ -29,13 +29,13 @@ versions: from: marketplace.gcr.io/google/c2d-debian11 packages: nginx: - version: 1.25.2 + version: 1.25.3 repo: nginx1 tags: - - 1.25.2-debian11 + - 1.25.3-debian11 - 1.25-debian11 - 1-debian11 - - 1.25.2 + - 1.25.3 - '1.25' - '1' - latest @@ -66,11 +66,11 @@ versions: from: marketplace.gcr.io/google/c2d-debian11 packages: exporter: - version: 0.11.0 + version: 0.14.0 repo: nginx-exporter0 tags: - - 0.11.0 - - '0.11' + - 0.14.0 + - '0.14' - '0' - latest templateSubDir: exporter From ff1559eb1959058c891ea8e533ca08475dd8f171 Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Thu, 8 Feb 2024 09:40:44 +0000 Subject: [PATCH 2/3] Nginx version updated to 1.25.3 --- 1/debian11/1.23/Dockerfile | 44 ---------------------------- 1/debian11/1.23/docker-entrypoint.sh | 29 ------------------ 1/debian11/1.23/stub.conf | 9 ------ 1/debian11/1.25/Dockerfile | 44 ---------------------------- 1/debian11/1.25/docker-entrypoint.sh | 29 ------------------ 1/debian11/1.25/stub.conf | 9 ------ versions.yaml | 2 +- 7 files changed, 1 insertion(+), 165 deletions(-) delete mode 100644 1/debian11/1.23/Dockerfile delete mode 100644 1/debian11/1.23/docker-entrypoint.sh delete mode 100644 1/debian11/1.23/stub.conf delete mode 100644 1/debian11/1.25/Dockerfile delete mode 100644 1/debian11/1.25/docker-entrypoint.sh delete mode 100644 1/debian11/1.25/stub.conf diff --git a/1/debian11/1.23/Dockerfile b/1/debian11/1.23/Dockerfile deleted file mode 100644 index c68fbac..0000000 --- a/1/debian11/1.23/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM marketplace.gcr.io/google/c2d-debian11 - -ENV NGINX_VERSION 1.23.4* -ENV C2D_RELEASE 1.23.4 - -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/mainline/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.23/docker-entrypoint.sh b/1/debian11/1.23/docker-entrypoint.sh deleted file mode 100644 index 6039f88..0000000 --- a/1/debian11/1.23/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.23/stub.conf b/1/debian11/1.23/stub.conf deleted file mode 100644 index 4f4d15a..0000000 --- a/1/debian11/1.23/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.25/Dockerfile b/1/debian11/1.25/Dockerfile deleted file mode 100644 index 44b9b04..0000000 --- a/1/debian11/1.25/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM marketplace.gcr.io/google/c2d-debian11 - -ENV NGINX_VERSION 1.25.3* -ENV C2D_RELEASE 1.25.3 - -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/mainline/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.25/docker-entrypoint.sh b/1/debian11/1.25/docker-entrypoint.sh deleted file mode 100644 index 6039f88..0000000 --- a/1/debian11/1.25/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.25/stub.conf b/1/debian11/1.25/stub.conf deleted file mode 100644 index 4f4d15a..0000000 --- a/1/debian11/1.25/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/versions.yaml b/versions.yaml index e0123e3..0af9cf4 100644 --- a/versions.yaml +++ b/versions.yaml @@ -66,7 +66,7 @@ versions: from: marketplace.gcr.io/google/c2d-debian11 packages: exporter: - version: 0.14.0 + version: 0.11.0 repo: nginx-exporter0 tags: - 0.14.0 From bcd351f283e7335d934a54334a7d5a0f11aa6f62 Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Thu, 8 Feb 2024 09:48:37 +0000 Subject: [PATCH 3/3] Nginx version updated to 1.25.3 --- 1/debian11/1.23/Dockerfile | 44 ++++++++++++++++++++++++++++ 1/debian11/1.23/docker-entrypoint.sh | 29 ++++++++++++++++++ 1/debian11/1.23/stub.conf | 9 ++++++ 1/debian11/1.25/Dockerfile | 44 ++++++++++++++++++++++++++++ 1/debian11/1.25/docker-entrypoint.sh | 29 ++++++++++++++++++ 1/debian11/1.25/stub.conf | 9 ++++++ exporter/Dockerfile | 2 +- 7 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 1/debian11/1.23/Dockerfile create mode 100644 1/debian11/1.23/docker-entrypoint.sh create mode 100644 1/debian11/1.23/stub.conf create mode 100644 1/debian11/1.25/Dockerfile create mode 100644 1/debian11/1.25/docker-entrypoint.sh create mode 100644 1/debian11/1.25/stub.conf diff --git a/1/debian11/1.23/Dockerfile b/1/debian11/1.23/Dockerfile new file mode 100644 index 0000000..c68fbac --- /dev/null +++ b/1/debian11/1.23/Dockerfile @@ -0,0 +1,44 @@ +FROM marketplace.gcr.io/google/c2d-debian11 + +ENV NGINX_VERSION 1.23.4* +ENV C2D_RELEASE 1.23.4 + +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/mainline/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.23/docker-entrypoint.sh b/1/debian11/1.23/docker-entrypoint.sh new file mode 100644 index 0000000..6039f88 --- /dev/null +++ b/1/debian11/1.23/docker-entrypoint.sh @@ -0,0 +1,29 @@ +#!/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.23/stub.conf b/1/debian11/1.23/stub.conf new file mode 100644 index 0000000..4f4d15a --- /dev/null +++ b/1/debian11/1.23/stub.conf @@ -0,0 +1,9 @@ +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.25/Dockerfile b/1/debian11/1.25/Dockerfile new file mode 100644 index 0000000..44b9b04 --- /dev/null +++ b/1/debian11/1.25/Dockerfile @@ -0,0 +1,44 @@ +FROM marketplace.gcr.io/google/c2d-debian11 + +ENV NGINX_VERSION 1.25.3* +ENV C2D_RELEASE 1.25.3 + +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/mainline/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.25/docker-entrypoint.sh b/1/debian11/1.25/docker-entrypoint.sh new file mode 100644 index 0000000..6039f88 --- /dev/null +++ b/1/debian11/1.25/docker-entrypoint.sh @@ -0,0 +1,29 @@ +#!/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.25/stub.conf b/1/debian11/1.25/stub.conf new file mode 100644 index 0000000..4f4d15a --- /dev/null +++ b/1/debian11/1.25/stub.conf @@ -0,0 +1,9 @@ +server { + listen 8080; + location /stub_status { + stub_status on; + access_log off; + allow 127.0.0.1; + deny all; + } +} diff --git a/exporter/Dockerfile b/exporter/Dockerfile index 6a25518..6fc996c 100644 --- a/exporter/Dockerfile +++ b/exporter/Dockerfile @@ -1,6 +1,6 @@ FROM marketplace.gcr.io/google/c2d-debian11 -ENV EXPORTER_VERSION 0.14.0 +ENV EXPORTER_VERSION 0.11.0 COPY licenses/ /usr/share/doc/