From d8265d0a0be62dd54518426248fd6a972e9d8a54 Mon Sep 17 00:00:00 2001
From: Bruce Collie <brucecollie82@gmail.com>
Date: Fri, 13 Oct 2023 10:50:28 +0100
Subject: [PATCH] stack

---
 .github/actions/with-docker/action.yml | 14 +++++++-------
 package/arch/Dockerfile                | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/actions/with-docker/action.yml b/.github/actions/with-docker/action.yml
index 9dfe5840555..904c50c85dd 100644
--- a/.github/actions/with-docker/action.yml
+++ b/.github/actions/with-docker/action.yml
@@ -49,13 +49,13 @@ runs:
       GROUP=$(id -gn)
       GROUP_ID=$(id -g)
 
-      docker build ${SUBDIR}                                          \
-          --build-arg USER=${USER} --build-arg USER_ID=${USER_ID}     \
-          --build-arg GROUP=${GROUP} --build-arg GROUP_ID=${GROUP_ID} \
-          --build-arg BASE_OS=${BASE_OS}                              \
-          --build-arg BASE_DISTRO=${BASE_DISTRO}                      \
-          --tag stack:${BASE_DISTRO}-${K_VERSION}                     \
-          --file ${SUBDIR}${DOCKERFILE}.stack-deps
+      # docker build ${SUBDIR}                                          \
+      #     --build-arg USER=${USER} --build-arg USER_ID=${USER_ID}     \
+      #     --build-arg GROUP=${GROUP} --build-arg GROUP_ID=${GROUP_ID} \
+      #     --build-arg BASE_OS=${BASE_OS}                              \
+      #     --build-arg BASE_DISTRO=${BASE_DISTRO}                      \
+      #     --tag stack:${BASE_DISTRO}-${K_VERSION}                     \
+      #     --file ${SUBDIR}${DOCKERFILE}.stack-deps
       docker build ${SUBDIR}                                          \
           --build-arg USER=${USER} --build-arg USER_ID=${USER_ID}     \
           --build-arg GROUP=${GROUP} --build-arg GROUP_ID=${GROUP_ID} \
diff --git a/package/arch/Dockerfile b/package/arch/Dockerfile
index 9cd5c8568b6..cc96aa1787e 100644
--- a/package/arch/Dockerfile
+++ b/package/arch/Dockerfile
@@ -1,7 +1,7 @@
-ARG BASE_OS
-ARG BASE_DISTRO
-ARG K_VERSION
-FROM stack:${BASE_DISTRO}-${K_VERSION} as STACK
+# ARG BASE_OS
+# ARG BASE_DISTRO
+# ARG K_VERSION
+# FROM stack:${BASE_DISTRO}-${K_VERSION} as STACK
 
 ARG BASE_OS
 ARG BASE_DISTRO
@@ -51,5 +51,5 @@ USER ${USER_ID}:${GROUP_ID}
 
 ENV PATH="${PATH}:/usr/bin/core_perl"
 
-COPY --from=STACK --chown=$USER:$GROUP /home/$USER/.stack /home/$USER/.stack
+# COPY --from=STACK --chown=$USER:$GROUP /home/$USER/.stack /home/$USER/.stack
 COPY --from=MAVEN --chown=$USER:$GROUP /home/$USER/.m2 /home/$USER/.m2