docker
/
docker-devuan_paddy-hack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tie build timestamp to the suite 

This is in preparation for #3 where a single timestamp for multiple
suites does not scale.
This commit is contained in:
Olaf Meeuwissen 2017-10-22 18:04:04 +09:00
parent b8a2710d37
commit 5e70ba3b52
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -26,10 +26,10 @@ ADD $ROOTFS.tar.gz /
CMD ["bash"] CMD ["bash"]
EOF EOF
docker build -t $IMAGE:$STAMP . docker build -t $IMAGE:$SUITE-$STAMP .
docker push $IMAGE:$STAMP docker push $IMAGE:$SUITE-$STAMP
docker tag $IMAGE:$STAMP $IMAGE:$SUITE docker tag $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
docker push $IMAGE:$SUITE docker push $IMAGE:$SUITE
if test $SUITE = $DEVUAN_RELEASE; then if test $SUITE = $DEVUAN_RELEASE; then
docker tag $IMAGE:$SUITE $IMAGE docker tag $IMAGE:$SUITE $IMAGE
@ -51,10 +51,10 @@ ADD $ROOTFS-slim.tar.gz /
CMD ["bash"] CMD ["bash"]
EOF EOF
docker build -t $IMAGE:$STAMP . docker build -t $IMAGE:$SUITE-$STAMP .
docker push $IMAGE:$STAMP docker push $IMAGE:$SUITE-$STAMP
docker tag $IMAGE:$STAMP $IMAGE:$SUITE docker tag $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
docker push $IMAGE:$SUITE docker push $IMAGE:$SUITE
if test $SUITE = $DEVUAN_RELEASE; then if test $SUITE = $DEVUAN_RELEASE; then
docker tag $IMAGE:$SUITE $IMAGE docker tag $IMAGE:$SUITE $IMAGE

12
derive.sh
View File

@ -12,11 +12,11 @@ STAMP=$(date +%F)
docker build \ docker build \
--build-arg DEVUAN_IMAGE=$BASE_IMAGE \ --build-arg DEVUAN_IMAGE=$BASE_IMAGE \
--tag $IMAGE:$STAMP \ --tag $IMAGE:$SUITE-$STAMP \
--file $(basename $IMAGE).df . --file $(basename $IMAGE).df .
docker push $IMAGE:$STAMP docker push $IMAGE:$SUITE-$STAMP
docker tag $IMAGE:$STAMP $IMAGE:$SUITE docker tag $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
docker push $IMAGE:$SUITE docker push $IMAGE:$SUITE
if test $SUITE = $DEVUAN_RELEASE; then if test $SUITE = $DEVUAN_RELEASE; then
docker tag $IMAGE:$SUITE $IMAGE docker tag $IMAGE:$SUITE $IMAGE
@ -28,11 +28,11 @@ IMAGE=$CI_REGISTRY_IMAGE/helper
docker build \ docker build \
--build-arg DEVUAN_IMAGE=$BASE_IMAGE \ --build-arg DEVUAN_IMAGE=$BASE_IMAGE \
--tag $IMAGE:$STAMP \ --tag $IMAGE:$SUITE-$STAMP \
--file $(basename $IMAGE).df . --file $(basename $IMAGE).df .
docker push $IMAGE:$STAMP docker push $IMAGE:$SUITE-$STAMP
docker tag $IMAGE:$STAMP $IMAGE:$SUITE docker tag $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
docker push $IMAGE:$SUITE docker push $IMAGE:$SUITE
if test $SUITE = $DEVUAN_RELEASE; then if test $SUITE = $DEVUAN_RELEASE; then
docker tag $IMAGE:$SUITE $IMAGE docker tag $IMAGE:$SUITE $IMAGE