diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a626b30e0281ee50ffee278c871a9389706bd55..5b34ad77fc5782d0d7fc5e571542733d192631b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # maintained by q3k, built using docker/build-env -image: "registry.k0.hswaw.net/q3k/card10-build-env:20190729-231409Z-635fb98" +image: "derq3k/card10-build-env:20190806-195837Z-f95b541-dirty" build: stage: build @@ -13,7 +13,7 @@ build: lint: stage: test - image: "registry.k0.hswaw.net/q3k/card10-lint-env:20190728-233522Z-ded74f0-dirty" + image: "derq3k/card10-lint-env:20190806-201106Z-f95b541-dirty" script: # Annoyatron is maintained by q3k. Its job is to serve MR comments that are friendlier than just a failing pipeline. # source code: https://git.card10.badge.events.ccc.de/q3k/annoyatron/ @@ -31,7 +31,7 @@ lint: pages: stage: deploy # maintaned by q3k, build using docker/deploy-env - image: "registry.k0.hswaw.net/q3k/card10-deploy-env:20190725-112709Z-4c5d8e8" + image: "derq3k/card10-deploy-env:20190806-200743Z-f95b541-dirty" script: - export LD_LIBRARY_PATH=$(llvm-config --libdir) - echo $LD_LIBRARY_PATH diff --git a/docker/build-env/push.sh b/docker/build-env/push.sh index 0458b84db6f54d051cbf85e3cdeb16f7011b413e..b1733be34134e03e1012c7c316b3a1d212843c26 100755 --- a/docker/build-env/push.sh +++ b/docker/build-env/push.sh @@ -8,7 +8,7 @@ function rev() { ( cd $1; git describe --always --match "v[0-9].*" --dirty ) } -IMAGE=registry.k0.hswaw.net/q3k/card10-build-env +IMAGE=derq3k/card10-build-env TAG=$(TZ=UTC date +%Y%m%d-%H%M%SZ)-$(rev .) docker build -t $IMAGE:$TAG . diff --git a/docker/deploy-env/push.sh b/docker/deploy-env/push.sh index 6efb60278ae312e6c12817bb40ba22f4d16f7272..27a2b3e7c992dbf37a58da149d9e8dda8202a9ca 100755 --- a/docker/deploy-env/push.sh +++ b/docker/deploy-env/push.sh @@ -8,7 +8,7 @@ function rev() { ( cd $1; git describe --always --match "v[0-9].*" --dirty ) } -IMAGE=registry.k0.hswaw.net/q3k/card10-deploy-env +IMAGE=derq3k/card10-deploy-env TAG=$(TZ=UTC date +%Y%m%d-%H%M%SZ)-$(rev .) docker build -t $IMAGE:$TAG . diff --git a/docker/lint-env/push.sh b/docker/lint-env/push.sh index 08cc60924ae33b9d53c32fd435eb2d8dbeb85787..3b2bf48a83c70dd83bc848fd4d5ac9e87f195eec 100755 --- a/docker/lint-env/push.sh +++ b/docker/lint-env/push.sh @@ -8,7 +8,7 @@ function rev() { ( cd $1; git describe --always --match "v[0-9].*" --dirty ) } -IMAGE=registry.k0.hswaw.net/q3k/card10-lint-env +IMAGE=derq3k/card10-lint-env TAG=$(TZ=UTC date +%Y%m%d-%H%M%SZ)-$(rev .) docker build -t $IMAGE:$TAG .