-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #342 from threefoldtech/development_fix_wordpress
update zinit and fix mysql install in wordpress image
- Loading branch information
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ RUN set -eux; \ | |
apt-get update; \ | ||
apt-get install -y --no-install-recommends ca-certificates wget; \ | ||
rm -rf /var/lib/apt/lists/*; \ | ||
wget https://github.com/threefoldtech/zinit/releases/download/v0.2.12/zinit -O /sbin/zinit; \ | ||
wget https://github.com/threefoldtech/zinit/releases/download/0.2.14/zinit -O /sbin/zinit; \ | ||
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ | ||
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ | ||
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ | ||
|
@@ -47,7 +47,7 @@ RUN set -eux; \ | |
|
||
RUN set -eux; \ | ||
# gpg: key 3A79BD29: public key "MySQL Release Engineering <[email protected]>" imported | ||
key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ | ||
key='B7B3B788A8D3785C'; \ | ||
export GNUPGHOME="$(mktemp -d)"; \ | ||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ | ||
mkdir -p /etc/apt/keyrings; \ | ||
|
@@ -56,7 +56,7 @@ RUN set -eux; \ | |
rm -rf "$GNUPGHOME" | ||
|
||
ENV MYSQL_MAJOR 8.0 | ||
ENV MYSQL_VERSION 8.0.34-1debian11 | ||
ENV MYSQL_VERSION 8.0.37-1debian11 | ||
|
||
RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list | ||
|
||
|