Switch to MariaDB's repo configurator to avoid a hard dependency on their Docker image's OS version.
This commit is contained in:
parent
ddac3b8326
commit
c853f23807
|
@ -47,8 +47,6 @@ COPY --from=go-dependencies /go/bin/centrifugo /usr/local/bin/centrifugo
|
|||
# Add MariaDB dependencies
|
||||
COPY --from=mariadb /usr/local/bin/healthcheck.sh /usr/local/bin/db_healthcheck.sh
|
||||
COPY --from=mariadb /usr/local/bin/docker-entrypoint.sh /usr/local/bin/db_entrypoint.sh
|
||||
COPY --from=mariadb /etc/apt/sources.list.d/mariadb.list /etc/apt/sources.list.d/mariadb.list
|
||||
COPY --from=mariadb /etc/apt/trusted.gpg.d/mariadb.gpg /etc/apt/trusted.gpg.d/mariadb.gpg
|
||||
|
||||
# Add Icecast
|
||||
COPY --from=icecast /usr/local/bin/icecast /usr/local/bin/icecast
|
||||
|
|
|
@ -2,11 +2,8 @@
|
|||
set -e
|
||||
set -x
|
||||
|
||||
{
|
||||
echo 'Package: *'; \
|
||||
echo 'Pin: release o=MariaDB'; \
|
||||
echo 'Pin-Priority: 999'; \
|
||||
} > /etc/apt/preferences.d/mariadb
|
||||
curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | bash -s -- \
|
||||
--mariadb-server-version=11.2
|
||||
|
||||
{ \
|
||||
echo "mariadb-server" mysql-server/root_password password 'unused'; \
|
||||
|
|
Loading…
Reference in New Issue