Move installed packages to /opt/spm/

7 files changed, 15 insertions, 14 deletions

diff --git a/OpenSSL/3.1.1-minimal/Dockerfile b/OpenSSL/3.1.1-minimal/Dockerfile
index 1cae3bc..b99eb8d 100644
--- a/OpenSSL/3.1.1-minimal/Dockerfile
+++ b/OpenSSL/3.1.1-minimal/Dockerfile
@@ -6,7 +6,7 @@ RUN apk update && apk add \
 	musl-dev \
 	linux-headers \
 	perl
-ARG PREFIX=/install/openssl-3.1.1
+ARG PREFIX=/opt/spm/openssl-3.1.1
 RUN git clone --depth 1 -b openssl-3.1.1 git://git.openssl.org/openssl.git
 WORKDIR /openssl
 RUN ./config -ffunction-sections -fdata-sections \
diff --git a/SDL/1.2.15-minimal/Dockerfile b/SDL/1.2.15-minimal/Dockerfile
index 10f0094..259a302 100644
--- a/SDL/1.2.15-minimal/Dockerfile
+++ b/SDL/1.2.15-minimal/Dockerfile
@@ -7,7 +7,7 @@ RUN apk update && apk add \
 	musl-dev
 RUN git clone --depth 1 --recursive https://github.com/libsdl-org/SDL-1.2
 WORKDIR /SDL-1.2
-ARG PREFIX=/install/SDL-1.2.15
+ARG PREFIX=/opt/spm/SDL-1.2.15
 RUN ./configure \
     --prefix=$PREFIX \
     --enable-shared=no \
diff --git a/SDL_gfx/2.0.26/Dockerfile b/SDL_gfx/2.0.26/Dockerfile
index 7bbb66d..2b45f9a 100644
--- a/SDL_gfx/2.0.26/Dockerfile
+++ b/SDL_gfx/2.0.26/Dockerfile
@@ -5,13 +5,13 @@ RUN apk update && apk add \
 	gcc \
 	musl-dev \
     wget
-COPY --from=libsdl:1.2.15 /install/SDL-1.2.15/ /usr/local/
+COPY --from=libsdl:1.2.15 /opt/spm/SDL-1.2.15/ /usr/local/
 # sdl-config must be edited when moved to another prefix.
-RUN sed -ie 's,/install/SDL-1.2.15,/usr/local,g' $(which sdl-config)
+RUN sed -ie 's,/opt/spm/SDL-1.2.15,/usr/local,g' $(which sdl-config)
 RUN wget http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.26.tar.gz
 RUN tar -xf SDL_gfx-2.0.26.tar.gz
 WORKDIR /SDL_gfx-2.0.26
-ARG PREFIX=/install/SDL_gfx-2.0.26
+ARG PREFIX=/opt/spm/SDL_gfx-2.0.26
 RUN ./configure \
     --prefix=$PREFIX \
     --enable-shared=no \
diff --git a/SDL_mixer/1.2.12-minimal/Dockerfile b/SDL_mixer/1.2.12-minimal/Dockerfile
index 72b2f2f..9e8702b 100644
--- a/SDL_mixer/1.2.12-minimal/Dockerfile
+++ b/SDL_mixer/1.2.12-minimal/Dockerfile
@@ -5,13 +5,13 @@ RUN apk update && apk add \
 	gcc \
 	musl-dev \
     wget
-COPY --from=libsdl:1.2.15 /install/SDL-1.2.15/ /usr/local/
+COPY --from=libsdl:1.2.15 /opt/spm/SDL-1.2.15/ /usr/local/
 # sdl-config must be edited when moved to another prefix.
-RUN sed -ie 's,/install/SDL-1.2.15,/usr/local,g' $(which sdl-config)
+RUN sed -ie 's,/opt/spm/SDL-1.2.15,/usr/local,g' $(which sdl-config)
 RUN wget https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 RUN tar -xf SDL_mixer-1.2.12.tar.gz
 WORKDIR /SDL_mixer-1.2.12
-ARG PREFIX=/install/SDL_mixer-1.2.12
+ARG PREFIX=/opt/spm/SDL_mixer-1.2.12
 RUN ./configure \
     --prefix=$PREFIX \
     --enable-shared=no \
diff --git a/cJSON/1.7.16/Dockerfile b/cJSON/1.7.16/Dockerfile
index 987df7b..e14a706 100644
--- a/cJSON/1.7.16/Dockerfile
+++ b/cJSON/1.7.16/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine
-ARG PREFIX=/install/cjson-1.7.16
+ARG PREFIX=/opt/spm/cjson-1.7.16
 RUN apk update && apk add \
 	git \
 	cmake \
diff --git a/enet/1.3.17/Dockerfile b/enet/1.3.17/Dockerfile
index dfafb53..9881b72 100644
--- a/enet/1.3.17/Dockerfile
+++ b/enet/1.3.17/Dockerfile
@@ -8,7 +8,7 @@ RUN apk update && apk add \
 RUN wget http://enet.bespin.org/download/enet-1.3.17.tar.gz
 RUN tar -xf enet-1.3.17.tar.gz
 WORKDIR /enet-1.3.17
-ARG PREFIX=/install/enet-1.3.17
+ARG PREFIX=/opt/spm/enet-1.3.17
 RUN ./configure \
     --prefix=$PREFIX \
     --enable-shared=no \
diff --git a/slcl/master/Dockerfile b/slcl/master/Dockerfile
index b910159..5262f4f 100644
--- a/slcl/master/Dockerfile
+++ b/slcl/master/Dockerfile
@@ -4,9 +4,10 @@ RUN apk update && apk add \
 	make \
 	gcc \
 	musl-dev
-COPY --from=libcjson:1.7.16 /install/cjson-1.7.16/ /usr/local/
-COPY --from=libopenssl:3.1.1-minimal /install/openssl-3.1.1/ /usr/local/
-RUN git clone --depth 1 --recursive https://gitea.privatedns.org/xavi92/slcl
-WORKDIR /slcl
+COPY --from=libcjson:1.7.16 /opt/spm/cjson-1.7.16/ /usr/local/
+COPY --from=libopenssl:3.1.1-minimal /opt/spm/openssl-3.1.1/ /usr/local/
+RUN git clone --depth 1 --recursive https://gitea.privatedns.org/xavi92/slcl \
+	/opt/spm/slcl-master
+WORKDIR /opt/spm/slcl-master
 RUN make LDFLAGS=-static -j$(nproc --all)
 RUN strip slcl