From 6213033ec08e8947754c7fbdbf0acb6734384c9d Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Tue, 3 Dec 2024 07:01:49 +1100
Subject: [PATCH] Updated seed to not use the Dockerfile.

---
 Dockerfile.seed | 11 -----------
 seed.sh         | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 Dockerfile.seed

diff --git a/Dockerfile.seed b/Dockerfile.seed
deleted file mode 100644
index 6199f72..0000000
--- a/Dockerfile.seed
+++ /dev/null
@@ -1,11 +0,0 @@
-ARG BASE_IMAGE=drevops/mariadb-drupal-data:latest
-
-FROM ${BASE_IMAGE}
-
-COPY --chown=mysql:mysql .data /home/db-data/
-
-USER root
-
-RUN /bin/fix-permissions /home/db-data
-
-USER mysql
diff --git a/seed.sh b/seed.sh
index 0a8330a..4fe0377 100755
--- a/seed.sh
+++ b/seed.sh
@@ -187,6 +187,10 @@ note "Destination platform(s): ${DESTINATION_PLATFORMS}"
 
 info "Stage 1: Produce database structure files from dump file"
 
+task "Pulling the base image ${BASE_IMAGE}."
+docker pull "${BASE_IMAGE}"
+pass "Pulled the base image ${BASE_IMAGE}."
+
 start_container "${BASE_IMAGE}"
 cid="$(get_started_container_id "${BASE_IMAGE}")"
 
@@ -217,7 +221,14 @@ stop_container "${cid}"
 info "Stage 2: Build image"
 
 task "Build image ${DST_IMAGE} for ${DESTINATION_PLATFORMS} platform(s) from ${BASE_IMAGE}."
-docker buildx build --no-cache --build-arg="BASE_IMAGE=${BASE_IMAGE}" --platform "${DESTINATION_PLATFORMS}" --tag "${DST_IMAGE}" --push -f Dockerfile.seed .
+cat <<EOF | docker buildx build --no-cache --build-arg="BASE_IMAGE=${BASE_IMAGE}" --platform "${DESTINATION_PLATFORMS}" --tag "${DST_IMAGE}" --push -f - .
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
+COPY --chown=mysql:mysql .data /home/db-data/
+USER root
+RUN /bin/fix-permissions /home/db-data
+USER mysql
+EOF
 pass "Built image ${DST_IMAGE} for ${DESTINATION_PLATFORMS} platform(s) from ${BASE_IMAGE}."
 
 info "Stage 3: Test image"