Skip to content

Added ARM64 to simplerisk-minimal #126

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

Merged
jsokol merged 2 commits into from
Apr 11, 2026
Merged

Added ARM64 to simplerisk-minimal #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e14319e
Added ARM64 to simplerisk-minimal
jsokol Apr 11, 2026
3cfaeb5
Merge branch 'master' into ARM64
jsokol Apr 11, 2026
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
13 changes: 10 additions & 3 deletions simplerisk-minimal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,22 @@ WORKDIR /var/www

SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]

# Install required packages, including MySQL client from Debian repos
# NOTE: The MySQL key was taken from https://dev.mysql.com/doc/refman/8.4/en/checking-gpg-signature.html
# amd64 uses the Debian repo; arm64 uses the Ubuntu Noble repo (MySQL's Debian repo has no arm64 packages)
# Install required packages, including MySQL client
RUN mkdir -p /etc/apt/keyrings && \
apt-get update && \
apt-get install -y --no-install-recommends gnupg2 wget lsb-release && \
mkdir -p /etc/apt/keyrings && \
export GNUPGHOME="$(mktemp -d)" && \
gpg --batch --keyserver keys.gnupg.net --recv-keys B7B3B788A8D3785C && \
gpg --batch --export B7B3B788A8D3785C > /etc/apt/trusted.gpg.d/mysql.gpg && \
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] http://repo.mysql.com/apt/debian/ trixie mysql-8.4-lts" | tee /etc/apt/sources.list.d/mysql.list && \
ARCH="$(dpkg --print-architecture)" && \
if [ "$ARCH" = "arm64" ]; then \
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] http://repo.mysql.com/apt/ubuntu/ noble mysql-8.4-lts" | tee /etc/apt/sources.list.d/mysql.list; \
else \
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] http://repo.mysql.com/apt/debian/ trixie mysql-8.4-lts" | tee /etc/apt/sources.list.d/mysql.list; \
fi && \
apt-get update && \
apt-get install -y --no-install-recommends \
libldap2-dev \
Expand All @@ -47,7 +54,7 @@ RUN mkdir -p /etc/apt/keyrings && \
rm -rf /var/lib/apt/lists/*

# Configure all PHP extensions
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \
RUN docker-php-ext-configure ldap --with-libdir=lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) && \
docker-php-ext-install ldap \
mysqli \
pdo_mysql \
Expand Down
13 changes: 10 additions & 3 deletions simplerisk-minimal/generate_dockerfile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,22 @@ WORKDIR /var/www

SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]

# Install required packages, including MySQL client from Debian repos
# NOTE: The MySQL key was taken from https://dev.mysql.com/doc/refman/8.4/en/checking-gpg-signature.html
# amd64 uses the Debian repo; arm64 uses the Ubuntu Noble repo (MySQL's Debian repo has no arm64 packages)
# Install required packages, including MySQL client
RUN mkdir -p /etc/apt/keyrings && \\
apt-get update && \\
apt-get install -y --no-install-recommends gnupg2 wget lsb-release && \\
mkdir -p /etc/apt/keyrings && \\
export GNUPGHOME="\$(mktemp -d)" && \\
gpg --batch --keyserver keys.gnupg.net --recv-keys B7B3B788A8D3785C && \\
gpg --batch --export B7B3B788A8D3785C > /etc/apt/trusted.gpg.d/mysql.gpg && \\
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] http://repo.mysql.com/apt/debian/ trixie mysql-8.4-lts" | tee /etc/apt/sources.list.d/mysql.list && \\
ARCH="\$(dpkg --print-architecture)" && \\
if [ "\$ARCH" = "arm64" ]; then \\
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] http://repo.mysql.com/apt/ubuntu/ noble mysql-8.4-lts" | tee /etc/apt/sources.list.d/mysql.list; \\
else \\
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] http://repo.mysql.com/apt/debian/ trixie mysql-8.4-lts" | tee /etc/apt/sources.list.d/mysql.list; \\
fi && \\
apt-get update && \\
apt-get install -y --no-install-recommends \\
libldap2-dev \\
Expand All @@ -71,7 +78,7 @@ RUN mkdir -p /etc/apt/keyrings && \\
rm -rf /var/lib/apt/lists/*

# Configure all PHP extensions
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \\
RUN docker-php-ext-configure ldap --with-libdir=lib/\$(dpkg-architecture -qDEB_HOST_MULTIARCH) && \\
docker-php-ext-install ldap \\
mysqli \\
pdo_mysql \\
Expand Down
Loading