diff --git a/db/Dockerfile b/db/Dockerfile index 053fbcee6..8e99e85af 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,19 +1,10 @@ -FROM mariadb:10.7.5 +FROM mariadb:10.7.7 -ENV MYSQL_ROOT_PASSWORD root +ENV MARIADB_ROOT_PASSWORD root ENV TZ Europe/Madrid ARG MOCKDATE=2001-01-01 11:00:00 ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates \ - && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \ - && echo "deb http://apt.verdnatura.es/ jessie main" > /etc/apt/sources.list.d/vn.list \ - && apt-get update \ - && apt-get install -y vn-mariadb \ - && apt-get purge -y --auto-remove curl ca-certificates \ - && rm -rf /var/lib/apt/lists/* - COPY docker/docker.cnf /etc/mysql/conf.d/ COPY \ docker/docker-init.sh \ @@ -31,13 +22,11 @@ WORKDIR /docker-boot COPY \ import-changes.sh \ config.ini \ - dump/mysqlPlugins.sql \ dump/structure.sql \ dump/mockDate.sql \ dump/dumpedFixtures.sql \ ./ RUN gosu mysql docker-init.sh \ - && docker-dump.sh mysqlPlugins \ && docker-dump.sh structure \ && sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \ && docker-dump.sh mockDate \ diff --git a/db/docker/docker-temp-stop.sh b/db/docker/docker-temp-stop.sh index df66959df..418331f75 100755 --- a/db/docker/docker-temp-stop.sh +++ b/db/docker/docker-temp-stop.sh @@ -4,4 +4,3 @@ CMD=mysqld docker_setup_env "$CMD" -docker_temp_server_stop diff --git a/db/dump/mysqlPlugins.sql b/db/dump/mysqlPlugins.sql deleted file mode 100644 index c3b6f6ee4..000000000 --- a/db/dump/mysqlPlugins.sql +++ /dev/null @@ -1,4 +0,0 @@ - --- Import compiled functions -CREATE AGGREGATE FUNCTION minacum RETURNS INT SONAME 'minacum.so'; -CREATE AGGREGATE FUNCTION multimax RETURNS INT SONAME 'multimax.so';