Merge pull request #189 from pspdev/fix-docker-build

Fix docker build
pspdev · Jun 18, 2024 · a420edb · a420edb
2 parents 20fb837 + 5441a82
commit a420edb
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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}