Skip to content

[bugfix] The version must be set in a separate stage, so it can be reused in the other calls #280

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.

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

Merged
merged 1 commit into from
May 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions 10.11/Dockerfile.c10s
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ FROM quay.io/sclorg/s2i-core-c10s:c10s
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.11 \
MYSQL_SHORT_VERSION=1011 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=1011

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
Expand Down
6 changes: 4 additions & 2 deletions 10.11/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.11 \
MYSQL_SHORT_VERSION=1011 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=1011

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
Expand Down
6 changes: 4 additions & 2 deletions 10.11/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ FROM quay.io/fedora/s2i-core:42
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.11 \
MYSQL_SHORT_VERSION=1011 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=1011

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
Expand Down
7 changes: 4 additions & 3 deletions 10.11/Dockerfile.rhel10
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ FROM ubi10/s2i-core
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.11 \
MYSQL_SHORT_VERSION=1011 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=1011

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
VERSION=${MYSQL_VERSION} \
SUMMARY="MariaDB ${MYSQL_VERSION} SQL database server" \
DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \
image provides a containerized packaging of the MariaDB mysqld daemon and client application. \
Expand Down
6 changes: 4 additions & 2 deletions 10.11/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ FROM ubi9/s2i-core
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.11 \
MYSQL_SHORT_VERSION=1011 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=1011

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
Expand Down
6 changes: 4 additions & 2 deletions 10.5/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.5 \
MYSQL_SHORT_VERSION=105 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=105

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
Expand Down
6 changes: 4 additions & 2 deletions 10.5/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ FROM ubi9/s2i-core
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=10.5 \
MYSQL_SHORT_VERSION=105 \
VERSION="${MYSQL_VERSION}" \
MYSQL_SHORT_VERSION=105

ENV VERSION="${MYSQL_VERSION}" \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mariadb \
Expand Down