Skip to content

Commit 7607e16

Browse files
Merge pull request #116 from simplerisk/FIX-mysql
simplerisk-minimal: adapt mysql repo to bookworm
2 parents 2806123 + 1da9b5c commit 7607e16

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

.dockleignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This is being done, yet it is still being detected
2+
DKL-DI-0005

.grype.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ignore:
2+
- vulnerability: CVE-2025-27558 # Not able to fix it at the moment

simplerisk-minimal/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ RUN mkdir -p /etc/apt/keyrings && \
2323
apt-get update && \
2424
apt-get install -y --no-install-recommends gnupg2 wget lsb-release && \
2525
wget -qO - https://repo.mysql.com/RPM-GPG-KEY-mysql-2023 | gpg --dearmor -o /etc/apt/keyrings/mysql.gpg && \
26-
echo "deb [signed-by=/etc/apt/keyrings/mysql.gpg] http://repo.mysql.com/apt/debian/ $(lsb_release -cs) mysql-8.0" | tee /etc/apt/sources.list.d/mysql.list && \
26+
# FIXME: use $(lsb_release -cs) when trixie becomes available on MySQL repos
27+
echo "deb [signed-by=/etc/apt/keyrings/mysql.gpg] http://repo.mysql.com/apt/debian/ bookworm mysql-8.0" | tee /etc/apt/sources.list.d/mysql.list && \
2728
apt-get update && \
2829
apt-get -y install --no-install-recommends libldap2-dev \
2930
libicu-dev \

simplerisk-minimal/generate_dockerfile.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ RUN mkdir -p /etc/apt/keyrings && \\
4646
apt-get update && \\
4747
apt-get install -y --no-install-recommends gnupg2 wget lsb-release && \\
4848
wget -qO - $MYSQL_KEY_URL | gpg --dearmor -o /etc/apt/keyrings/mysql.gpg && \\
49-
echo "deb [signed-by=/etc/apt/keyrings/mysql.gpg] http://repo.mysql.com/apt/debian/ \$(lsb_release -cs) mysql-8.0" | tee /etc/apt/sources.list.d/mysql.list && \\
49+
# FIXME: use \$(lsb_release -cs) when trixie becomes available on MySQL repos
50+
echo "deb [signed-by=/etc/apt/keyrings/mysql.gpg] http://repo.mysql.com/apt/debian/ bookworm mysql-8.0" | tee /etc/apt/sources.list.d/mysql.list && \\
5051
apt-get update && \\
5152
apt-get -y install --no-install-recommends libldap2-dev \\
5253
libicu-dev \\

0 commit comments

Comments
 (0)