fix all tag, also install base-devel and use user ids

This commit is contained in:
Bryson Steck 2025-03-02 12:33:15 -07:00
parent 32ad6b2b72
commit 127bfa0d8b
2 changed files with 8 additions and 5 deletions

View file

@ -1,5 +1,5 @@
FROM archlinux:latest FROM archlinux:latest
ARG TOOLS="" ARG TOOLS="wii-dev"
ARG UID="1000" ARG UID="1000"
ARG GID="1000" ARG GID="1000"
@ -16,7 +16,7 @@ RUN echo Include = /etc/pacman.d/devkitpro.conf >> /etc/pacman.conf
RUN pacman -Syu --noconfirm RUN pacman -Syu --noconfirm
# install tools # install tools
RUN pacman -Sy --noconfirm $TOOLS RUN pacman -Sy --noconfirm base-devel $TOOLS
# setup environment # setup environment
RUN groupadd -g $GID devkitpro RUN groupadd -g $GID devkitpro

9
build
View file

@ -1,10 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
uid=$(id -u)
gid=$(id -g)
kits=(gp32-dev gp2x-dev gba-dev nds-dev 3ds-dev gamecube-dev wii-dev wiiu-dev switch-dev) kits=(gp32-dev gp2x-dev gba-dev nds-dev 3ds-dev gamecube-dev wii-dev wiiu-dev switch-dev)
for kit in ${kits[@]}; do for kit in ${kits[@]}; do
docker build -t devkitpro:$(echo $kit | sed "s|-dev||") --build-arg TOOLS="$kit" . echo building $kit...
docker build -t devkitpro:$(echo $kit | sed "s|-dev||") --build-arg TOOLS="$kit" --build-arg UID=$uid --build-arg GID=$gid .
done done
docker build -t devkitpro:all --build-arg TOOLS="${kits[@]}" . echo building all devkits...
docker build -t devkitpro:all --build-arg TOOLS="$(echo "${kits[@]}")" --build-arg UID=$uid --build-arg GID=$gid .