Revamp and modernize

Author: aaaronic

Dockerfile

@@ -1,27 +1,44 @@
-FROM debian:stretch
+FROM debian:trixie-slim AS wav2c_builder
 
-MAINTAINER Aaron Hansen <[email protected]>
+LABEL maintainer="Aaron Hansen <[email protected]>"
 # Copied/adapted from https://github.com/devkitPro/docker/blob/master/devkitarm/Dockerfile
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+WORKDIR /wav2c
+
+RUN apt-get update && \
+    apt-get install -y build-essential wget unzip
+
+RUN wget https://github.com/aaaronic/wav2c/archive/refs/heads/master.zip && \
+    unzip -j master.zip && \
+    make
+
+FROM debian:trixie-slim
+
 RUN apt-get update && \
-    apt-get install -y apt-utils vim && \
-    apt-get install -y --no-install-recommends sudo ca-certificates pkg-config curl wget bzip2 xz-utils make git bsdtar doxygen gnupg && \
+    apt-get install -y --no-install-recommends apt-utils && \
+    apt-get install -y --no-install-recommends sudo ca-certificates wget && \
     apt-get clean
 
-RUN wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.2/devkitpro-pacman.deb && \
-    dpkg -i devkitpro-pacman.deb && \
-    rm devkitpro-pacman.deb && \
-    dkp-pacman -Scc --noconfirm
+RUN ln -s /proc/self/mounts /etc/mtab
+
+RUN wget https://apt.devkitpro.org/install-devkitpro-pacman && \
+    chmod +x ./install-devkitpro-pacman && \
+    sudo yes | ./install-devkitpro-pacman && \
+    apt-get clean
 
 ENV DEVKITPRO=/opt/devkitpro
 ENV PATH=${DEVKITPRO}/tools/bin:$PATH
 
-RUN dkp-pacman -Syyu --noconfirm gba-dev && \
-    dkp-pacman -Scc --noconfirm
+RUN dkp-pacman -Syyu --noconfirm --needed gba-dev && \
+    yes | dkp-pacman -Scc
 ENV DEVKITARM=${DEVKITPRO}/devkitARM
-RUN mkdir /gba
-COPY wav2c /usr/local/bin
+
+ADD entrypoint.sh /usr/local/bin
+ADD Makefile /usr/default/Makefile
+COPY --from=wav2c_builder /wav2c/wav2c /usr/local/bin
+
 VOLUME ["/gba"]
-CMD cd /gba && make
+WORKDIR /gba
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]

Makefile

@@ -56,12 +56,12 @@ build : $(ROM_NAME)
 
 # --- Build .elf file into .gba ROM file
 $(ROM_NAME) : $(ELF_NAME)
-	$(OBJCOPY) $(OBJCOPYFLAGS) $(ELF_NAME) $(ROM_NAME)
+	$(OBJCOPY) $(OBJCOPYFLAGS) $^ $(ROM_NAME)
 	$(GBAFIX) $(ROM_NAME)
 
 # --- Build .o files into .elf file
 $(ELF_NAME) : $(OBJECTS)
-	$(LD) $(OBJECTS) $(LDFLAGS) -o $@
+	$(LD) $^ $(LDFLAGS) -o $@
 
 # -- Build .asm files into .o files
 $(ASMOBJECTS) : %.o : %.asm

entrypoint.sh

@@ -0,0 +1,15 @@
+#! /bin/bash
+# entrypoint.sh
+
+CLEANUP_MAKEFILE=
+if [[ ! -f /gba/Makefile ]]; then
+  echo "Using default Makefile"
+  cp /usr/default/Makefile /gba
+  CLEANUP_MAKEFILE=1
+fi
+
+make "$@"
+
+if [[ -n "$CLEANUP_MAKEFILE" ]]; then
+  rm /gba/Makefile
+fi