From 1b408f186cf8e737a883aea6d1ffcdd4bbb839aa Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:40:01 -0400 Subject: [PATCH 1/3] Update Dockerfile curl is installed by baseimage-alpine already, we were then installing it as a build dependency and purging it. it wasn't actually being purged, but regardless, curl is required for our remote_sql actions in 40-initialise-db --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b09215..fc3abd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,6 @@ ENV MYSQL_DIR="/config" ENV DATADIR=$MYSQL_DIR/databases RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - curl && \ echo "**** install runtime packages ****" && \ if [ -z ${MARIADB_VERSION+x} ]; then \ MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -28,8 +25,6 @@ RUN \ mariadb-common==${MARIADB_VERSION} \ mariadb-server-utils==${MARIADB_VERSION} && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.cache \ /tmp/* && \ From fe5a1ef9e8df5cc6ef7e114f905025b990f4dff8 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:40:38 -0400 Subject: [PATCH 2/3] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0a5ba6e..98d8fed 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,9 +12,6 @@ ENV MYSQL_DIR="/config" ENV DATADIR=$MYSQL_DIR/databases RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - curl && \ echo "**** install runtime packages ****" && \ if [ -z ${MARIADB_VERSION+x} ]; then \ MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -28,8 +25,6 @@ RUN \ mariadb-common==${MARIADB_VERSION} \ mariadb-server-utils==${MARIADB_VERSION} && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.cache \ /tmp/* && \ From 85f57fe9c1517092e719835c862294364229a264 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:40:58 -0400 Subject: [PATCH 3/3] Update Dockerfile.armhf --- Dockerfile.armhf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index afdc85e..b5243ea 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,9 +12,6 @@ ENV MYSQL_DIR="/config" ENV DATADIR=$MYSQL_DIR/databases RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - curl && \ echo "**** install runtime packages ****" && \ if [ -z ${MARIADB_VERSION+x} ]; then \ MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -28,8 +25,6 @@ RUN \ mariadb-common==${MARIADB_VERSION} \ mariadb-server-utils==${MARIADB_VERSION} && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.cache \ /tmp/* && \