From fa8c6462fad9a9814a5f70d7a8a59cd80dfad9fc Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Thu, 18 Jan 2024 16:28:16 +0000 Subject: [PATCH 1/5] Mysql version updated to 8.0.36 --- 8/debian11/8.0/Dockerfile | 4 ++-- versions.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8/debian11/8.0/Dockerfile b/8/debian11/8.0/Dockerfile index d360162..b3b82e2 100644 --- a/8/debian11/8.0/Dockerfile +++ b/8/debian11/8.0/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rm -rf "$GNUPGHOME" ENV MYSQL_MAJOR 8.0 -ENV MYSQL_VERSION 8.0.34-1debian11 -ENV C2D_RELEASE 8.0.34 +ENV MYSQL_VERSION 8.0.36-1debian11 +ENV C2D_RELEASE 8.0.36 RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bullseye mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list diff --git a/versions.yaml b/versions.yaml index c9dec24..9690f51 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,13 +29,13 @@ versions: mysql: gpg: 859BE8D7C586F538430B19C2467B942D3A79BD29 major: '8.0' - version: 8.0.34 + version: 8.0.36 repo: mysql8 tags: - - 8.0.34-debian11 + - 8.0.36-debian11 - 8.0-debian11 - 8-debian11 - - 8.0.34 + - 8.0.36 - '8.0' - '8' - latest From e59463b99505a74878c702f256e94508ed4f579c Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Fri, 19 Jan 2024 08:25:22 +0000 Subject: [PATCH 2/5] Mysql version updated to 8.0.36 and pub_key --- templates/debian11/Dockerfile.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/debian11/Dockerfile.template b/templates/debian11/Dockerfile.template index bef57fd..56872ab 100644 --- a/templates/debian11/Dockerfile.template +++ b/templates/debian11/Dockerfile.template @@ -9,7 +9,7 @@ FROM {{ .From }} # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases From 847ce99935801b654eb5b08c5fccb686088750d4 Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Fri, 19 Jan 2024 09:02:03 +0000 Subject: [PATCH 3/5] Renew dockerfiles --- 5/debian11/5.7/Dockerfile | 2 +- 8/debian11/8.0/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/5/debian11/5.7/Dockerfile b/5/debian11/5.7/Dockerfile index ae48e5c..c039572 100644 --- a/5/debian11/5.7/Dockerfile +++ b/5/debian11/5.7/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases diff --git a/8/debian11/8.0/Dockerfile b/8/debian11/8.0/Dockerfile index b3b82e2..be5ce90 100644 --- a/8/debian11/8.0/Dockerfile +++ b/8/debian11/8.0/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases From 92d1c73c0efab491d47a7be4b2e34a8e49343fda Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Fri, 19 Jan 2024 09:09:52 +0000 Subject: [PATCH 4/5] Renew dockerfiles --- 5/debian11/5.7/Dockerfile | 2 +- 8/debian11/8.0/Dockerfile | 2 +- templates/debian11/Dockerfile.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/5/debian11/5.7/Dockerfile b/5/debian11/5.7/Dockerfile index c039572..668de04 100644 --- a/5/debian11/5.7/Dockerfile +++ b/5/debian11/5.7/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases diff --git a/8/debian11/8.0/Dockerfile b/8/debian11/8.0/Dockerfile index be5ce90..3f43520 100644 --- a/8/debian11/8.0/Dockerfile +++ b/8/debian11/8.0/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases diff --git a/templates/debian11/Dockerfile.template b/templates/debian11/Dockerfile.template index 56872ab..850d976 100644 --- a/templates/debian11/Dockerfile.template +++ b/templates/debian11/Dockerfile.template @@ -9,7 +9,7 @@ FROM {{ .From }} # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases From c35177be5066b9974b8855dc7403774362effb6a Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Fri, 19 Jan 2024 09:19:21 +0000 Subject: [PATCH 5/5] Renew dockerfiles --- 5/debian11/5.7/Dockerfile | 4 ++-- 8/debian11/8.0/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/5/debian11/5.7/Dockerfile b/5/debian11/5.7/Dockerfile index 668de04..ac6ff2a 100644 --- a/5/debian11/5.7/Dockerfile +++ b/5/debian11/5.7/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases @@ -49,7 +49,7 @@ RUN set -eux; \ RUN set -eux; \ # gpg: key 3A79BD29: public key "MySQL Release Engineering " imported - key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ + key='B7B3B788A8D3785C'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ mkdir -p /etc/apt/keyrings; \ diff --git a/8/debian11/8.0/Dockerfile b/8/debian11/8.0/Dockerfile index 3f43520..d1aa0f0 100644 --- a/8/debian11/8.0/Dockerfile +++ b/8/debian11/8.0/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql -RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C +RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* # add gosu for easy step-down from root # https://github.com/tianon/gosu/releases @@ -49,7 +49,7 @@ RUN set -eux; \ RUN set -eux; \ # gpg: key 3A79BD29: public key "MySQL Release Engineering " imported - key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ + key='B7B3B788A8D3785C'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ mkdir -p /etc/apt/keyrings; \