Skip to content

Commit

Permalink
Fix docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
sharkwouter committed Jun 18, 2024
1 parent 20fb837 commit 5441a82
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,20 @@ RUN mv ${PSPDEV}/build.txt ${PSPDEV}/build1.txt
FROM alpine:latest

ENV PSPDEV /usr/local/pspdev
ENV PATH $PATH:${PSPDEV}/bin

COPY --from=0 ${PSPDEV} ${PSPDEV}
COPY --from=1 ${PSPDEV} ${PSPDEV}
COPY . .

RUN cat ${PSPDEV}/build0.txt ${PSPDEV}/build1.txt > ${PSPDEV}/build.txt && \
rm ${PSPDEV}/build0.txt ${PSPDEV}/build1.txt && \
apk add --no-cache git && \
git log -1 --format="psptoolchain %H %cs" >> ${PSPDEV}/build.txt
git log -1 --format="psptoolchain %H %cs %s" >> ${PSPDEV}/build.txt

# Last stage with everything combined
FROM alpine:latest

ENV PSPDEV /usr/local/pspdev
ENV PATH $PATH:${PSPDEV}/bin

COPY --from=2 ${PSPDEV} ${PSPDEV}

0 comments on commit 5441a82

Please sign in to comment.