Skip to content

Commit

Permalink
stack
Browse files Browse the repository at this point in the history
  • Loading branch information
Baltoli committed Oct 13, 2023
1 parent 00b6421 commit d8265d0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions .github/actions/with-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
10 changes: 5 additions & 5 deletions package/arch/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

0 comments on commit d8265d0

Please sign in to comment.