aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-10-25 20:44:21 +0100
committerSergey Poznyakoff <gray@gnu.org>2020-10-25 20:44:21 +0100
commit46397bcbb3b36eb256c3153571176162e519c749 (patch)
treedd340577cb1d1a9bef9d52c9cc46e918a3feabfb
parentbffafd15fde78c43a14db407c60e1ce1b53aca55 (diff)
downloadslackimage-46397bcbb3b36eb256c3153571176162e519c749.tar.gz
slackimage-46397bcbb3b36eb256c3153571176162e519c749.tar.bz2
New variable: TAG
-rw-r--r--Makefile5
-rw-r--r--docker-compose.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ec0a278..b4ab67b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,11 @@ ifeq (,$(wildcard .env))
echo "OUTPUT=$$(pwd)/out"; \
echo "## Name of the image tarball:"; \
echo "IMAGE=slackware-current-64.tar.gz"; \
+ echo "## Additional tag for the produced docker image. The"; \
+ echo "## image tag (in the docker sense) will be created by"; \
+ echo '## concatenating $$VERSION and $$TAG. If not empty, it'; \
+ echo '## is recommended to start the $$TAG value with underscore.'; \
+ echo "TAG="; \
echo "## URL of the Slackware mirror site (selected automatically)"; \
echo "#MIRROR="; \
} > .env
diff --git a/docker-compose.yml b/docker-compose.yml
index f3f3d4b..f2ba406 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
VERSION: ${VERSION}
SERIES: ${SERIES:-a ap d e f k l n t tcl}
dockerfile: Dockerfile
- image: slackimg:${VERSION}
+ image: slackimg:${VERSION}${TAG}
volumes:
- ${OUTPUT}:/mnt

Return to:

Send suggestions and report system problems to the System administrator.