aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlack Coder <slackcoder@server.ky>2025-05-14 10:48:45 -0500
committerSlack Coder <slackcoder@server.ky>2025-05-14 10:48:45 -0500
commit6dcbba8e9450d4a312880dea8e91ee4d58a3af0d (patch)
treed451519df30690d1850fa92da39dd579cc66b296
parent7e78680254d2d001f764e39bedfb4e7ad221e1f6 (diff)
downloadsbotools2-6dcbba8e9450d4a312880dea8e91ee4d58a3af0d.tar.xz
Docker: Use MIRROR build argdocker
Enable the user to optimize building by providing a mirror argument.
-rw-r--r--README.md2
-rw-r--r--docker/sbotools2-test:14.0.dockerfile2
-rw-r--r--docker/sbotools2-test:14.1.dockerfile2
-rw-r--r--docker/sbotools2-test:14.2.dockerfile2
-rw-r--r--docker/sbotools2-test:15.0.dockerfile5
5 files changed, 11 insertions, 2 deletions
diff --git a/README.md b/README.md
index ab73e79..464a967 100644
--- a/README.md
+++ b/README.md
@@ -58,5 +58,5 @@ Test categories are enabled via environment variables enabled via docker's '--en
```
docker build -t sbotools2-test:15.0 --file docker/sbotools2-test:15.0.dockerfile .
-docker run -v $(realpath .):/root/sbotools2 --env TEST_INSTALL=1 --env TEST_ONLINE=1 -t sbotools2-test:15.0
+docker run --rm -v $(realpath .):/root/sbotools2 --env TEST_INSTALL=1 --env TEST_ONLINE=1 -t sbotools2-test:15.0
```
diff --git a/docker/sbotools2-test:14.0.dockerfile b/docker/sbotools2-test:14.0.dockerfile
index f12465e..ed7c427 100644
--- a/docker/sbotools2-test:14.0.dockerfile
+++ b/docker/sbotools2-test:14.0.dockerfile
@@ -2,6 +2,8 @@
FROM vbatts/slackware:14.0
+ARG MIRROR=https://mirrors.slackware.com/slackware/slackware64-14.0
+
# Project must be mounted here.
VOLUME /root/sbotools2
diff --git a/docker/sbotools2-test:14.1.dockerfile b/docker/sbotools2-test:14.1.dockerfile
index 6e29280..144b046 100644
--- a/docker/sbotools2-test:14.1.dockerfile
+++ b/docker/sbotools2-test:14.1.dockerfile
@@ -2,6 +2,8 @@
FROM vbatts/slackware:14.1
+ARG MIRROR=https://mirrors.slackware.com/slackware/slackware64-14.1
+
# Project must be mounted here.
VOLUME /root/sbotools2
diff --git a/docker/sbotools2-test:14.2.dockerfile b/docker/sbotools2-test:14.2.dockerfile
index a55f004..fba6610 100644
--- a/docker/sbotools2-test:14.2.dockerfile
+++ b/docker/sbotools2-test:14.2.dockerfile
@@ -2,6 +2,8 @@
FROM vbatts/slackware:14.2
+ARG MIRROR=https://mirrors.slackware.com/slackware/slackware64-14.2
+
# Project must be mounted here.
VOLUME /root/sbotools2
diff --git a/docker/sbotools2-test:15.0.dockerfile b/docker/sbotools2-test:15.0.dockerfile
index 2f36e5f..0626fd1 100644
--- a/docker/sbotools2-test:15.0.dockerfile
+++ b/docker/sbotools2-test:15.0.dockerfile
@@ -2,10 +2,13 @@
FROM vbatts/slackware:15.0
+ARG MIRROR=https://mirrors.slackware.com/slackware/slackware64-15.0
+
# Project must be mounted here.
VOLUME /root/sbotools2
# Upgrade and install all
+RUN echo ${MIRROR} > /etc/slackpkg/mirrors
RUN sed -i 's/^WGETFLAGS=".*"/WGETFLAGS="--quiet --no-check-certificate"/g' /etc/slackpkg/slackpkg.conf
RUN yes y | slackpkg update && \
slackpkg install-new -terse && \
@@ -28,4 +31,4 @@ RUN git config --global user.name root \
WORKDIR /root/sbotools2
-CMD prove -v t/*.t
+CMD ["prove", "-v", "t"]