sbotools2

Maintenance fork of the original sbotools version 2
Log | Files | Refs | README

commit 6dcbba8e9450d4a312880dea8e91ee4d58a3af0d
parent 7e78680254d2d001f764e39bedfb4e7ad221e1f6
Author: Slack Coder <slackcoder@server.ky>
Date:   Wed, 14 May 2025 10:48:45 -0500

Docker: Use MIRROR build arg

Enable the user to optimize building by providing a mirror argument.

Diffstat:
MREADME.md | 2+-
Mdocker/sbotools2-test:14.0.dockerfile | 2++
Mdocker/sbotools2-test:14.1.dockerfile | 2++
Mdocker/sbotools2-test:14.2.dockerfile | 2++
Mdocker/sbotools2-test:15.0.dockerfile | 5++++-
5 files changed, 11 insertions(+), 2 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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"]