Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mysql] Docker images updates - 2024-01-18-101523 #101

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[mysql] Docker images updates - 2024-01-18-101523 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 5/debian11/5.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install

# add gosu for easy step-down from root
# https://github.com/tianon/gosu/releases
ENV GOSU_VERSION 1.16
ENV GOSU_VERSION 1.14
RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get --allow-releaseinfo-change update; \
Expand Down Expand Up @@ -58,10 +58,10 @@ RUN set -eux; \
rm -rf "$GNUPGHOME"

ENV MYSQL_MAJOR 5.7
ENV MYSQL_VERSION 5.7.42-1debian10
ENV MYSQL_VERSION 5.7.42-1debian
ENV C2D_RELEASE 5.7.42

RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ buster mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list

# the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql)
# also, we set debconf keys to make APT a little quieter
Expand Down
6 changes: 3 additions & 3 deletions 8/debian11/8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install

# add gosu for easy step-down from root
# https://github.com/tianon/gosu/releases
ENV GOSU_VERSION 1.16
ENV GOSU_VERSION 1.14
RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get --allow-releaseinfo-change update; \
Expand Down Expand Up @@ -58,10 +58,10 @@ RUN set -eux; \
rm -rf "$GNUPGHOME"

ENV MYSQL_MAJOR 8.0
ENV MYSQL_VERSION 8.0.34-1debian11
ENV MYSQL_VERSION 8.0.34-1debian
ENV C2D_RELEASE 8.0.34

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
RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list

# the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql)
# also, we set debconf keys to make APT a little quieter
Expand Down
13 changes: 4 additions & 9 deletions versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,7 +25,7 @@ versions:
packages:
gosu:
gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
version: '1.16'
version: '1.14'
mysql:
gpg: 859BE8D7C586F538430B19C2467B942D3A79BD29
major: '8.0'
Expand All @@ -39,9 +39,6 @@ versions:
- '8.0'
- '8'
- latest
templateArgs:
distroMajor: '11'
distroCodename: bullseye
templateSubDir: debian11
- dir: 5/debian11/5.7
excludeTests:
Expand All @@ -50,7 +47,7 @@ versions:
packages:
gosu:
gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
version: '1.16'
version: '1.14'
mysql:
gpg: 859BE8D7C586F538430B19C2467B942D3A79BD29
major: '5.7'
Expand All @@ -64,9 +61,6 @@ versions:
- '5.7'
- '5'
- latest
templateArgs:
distroMajor: '10'
distroCodename: buster
templateSubDir: debian11
- dir: exporter
excludeTests:
Expand Down Expand Up @@ -98,3 +92,4 @@ versions:
- exporter-0.14
- exporter-0.14.0
templateSubDir: exporter