Skip to content

Commit

Permalink
Fixed installation of mysql client instead of mariadb for simplerisk-…
Browse files Browse the repository at this point in the history
…minimal
  • Loading branch information
jsokol committed Jul 13, 2024
1 parent fa5a790 commit 5b35189
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
8 changes: 7 additions & 1 deletion simplerisk-minimal/generate_dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ FROM php:$image-apache
LABEL maintainer="Simplerisk <[email protected]>"
WORKDIR /var/www
# Add the apt config package
RUN apt-get update && \
apt-get install -y gnupg2 && \
apt-key adv --keyserver pgp.mit.edu --recv-keys A8D3785C && \
echo "deb http://repo.mysql.com/apt/debian bookworm mysql-8.0" > /etc/apt/sources.list.d/mysql.list
# Installing apt dependencies
RUN apt-get update && \\
Expand All @@ -33,7 +39,7 @@ RUN apt-get update && \\
libzip-dev \\
supervisor \\
cron \\
default-mysql-client && \\
mysql-community-client && \\
rm -rf /var/lib/apt/lists/*
# Configure all PHP extensions
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \\
Expand Down
8 changes: 7 additions & 1 deletion simplerisk-minimal/php81/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ FROM php:8.1-apache
LABEL maintainer="Simplerisk <[email protected]>"

WORKDIR /var/www

# Add the apt config package
RUN apt-get update && \
apt-get install -y gnupg2 && \
apt-key adv --keyserver pgp.mit.edu --recv-keys A8D3785C && \
echo "deb http://repo.mysql.com/apt/debian bookworm mysql-8.0" > /etc/apt/sources.list.d/mysql.list

# Installing apt dependencies
RUN apt-get update && \
Expand All @@ -17,7 +23,7 @@ RUN apt-get update && \
libzip-dev \
supervisor \
cron \
default-mysql-client && \
mysql-community-client && \
rm -rf /var/lib/apt/lists/*
# Configure all PHP extensions
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \
Expand Down
8 changes: 7 additions & 1 deletion simplerisk-minimal/php83/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ FROM php:8.3-apache
LABEL maintainer="Simplerisk <[email protected]>"

WORKDIR /var/www

# Add the apt config package
RUN apt-get update && \
apt-get install -y gnupg2 && \
apt-key adv --keyserver pgp.mit.edu --recv-keys A8D3785C && \
echo "deb http://repo.mysql.com/apt/debian bookworm mysql-8.0" > /etc/apt/sources.list.d/mysql.list

# Installing apt dependencies
RUN apt-get update && \
Expand All @@ -17,7 +23,7 @@ RUN apt-get update && \
libzip-dev \
supervisor \
cron \
default-mysql-client && \
mysql-community-client && \
rm -rf /var/lib/apt/lists/*
# Configure all PHP extensions
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \
Expand Down

0 comments on commit 5b35189

Please sign in to comment.