diff --git a/images/Makefile b/images/Makefile index d5ed8a7..c251852 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,8 +1,8 @@ IMAGEDIRS := $(shell ls */Dockerfile | xargs dirname) IMAGES := $(patsubst %,softwareheritage/%,$(IMAGEDIRS)) all: $(IMAGES) .PHONY: softwareheritage/% softwareheritage/%: %/Dockerfile - docker build -t $@:latest -f $< . + ./build_images.sh diff --git a/images/build_images.sh b/images/build_images.sh new file mode 100755 index 0000000..9f24f5d --- /dev/null +++ b/images/build_images.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +builddate=$(date +%Y%m%d-%H%M%S) + +username=$(docker info | grep Username | awk '{print $2}') + +for img in base web; do + docker build --build-arg SWH_VER=${builddate} --build-arg debianversion=buster -t softwareheritage/${img}:${builddate} -f ${img}/Dockerfile . + docker tag softwareheritage/${img}:${builddate} softwareheritage/${img}:latest + if [[ X${username} = Xsoftwareheritage ]]; then + docker push softwareheritage/${img}:${builddate} + docker push softwareheritage/${img}:latest + fi +done +