From a09065c9705cc0e7538937de56bb82e407267a79 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Mon, 12 Aug 2019 14:05:58 +0300 Subject: [PATCH 01/14] add to sccache features redis --- dockerfiles/parity-ci-linux/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockerfiles/parity-ci-linux/Dockerfile b/dockerfiles/parity-ci-linux/Dockerfile index 27ff9d97..b86cdb62 100644 --- a/dockerfiles/parity-ci-linux/Dockerfile +++ b/dockerfiles/parity-ci-linux/Dockerfile @@ -40,7 +40,8 @@ RUN set -eux; \ rm rustup-init; \ chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ rustup install nightly beta; \ - cargo install cargo-audit sccache; \ + cargo install cargo-audit; \ + cargo install sccache --features redis; \ # apt clean up apt-get autoremove -y; \ apt-get clean; \ From 540a6ecf1a7adf9dfae00d393ab1cb1a5b421627 Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 14 Aug 2019 15:25:30 +0200 Subject: [PATCH 02/14] parity images are now pushed to local registry --- .gitlab-ci.yml | 33 +++++++++++++++++++----- dockerfiles/parity-ci-android/Dockerfile | 2 +- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62959fce..ddc11192 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,25 @@ variables: environment: name: parity-build +.build_to_own_reg: &docker_build_to_own_reg + <<: *docker_build + before_script: + - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 + - docker login registry.parity.io + - docker info + script: + - cd dockerfiles/$DOCKERFILE_DIR + # - docker pull $CONTAINER_IMAGE:$CONTAINER_TAG || true + # - docker build --cache-from $CONTAINER_IMAGE:$CONTAINER_TAG --tag $CONTAINER_IMAGE:$CI_BUILD_REF --tag $CONTAINER_IMAGE:$CONTAINER_TAG . + - export CONTAINER_DATE_TAG="${CI_COMMIT_SHORT_SHA}-$(date +%Y%m%d)" + - docker build --no-cache + --build-arg VCS_REF="${CI_COMMIT_SHA}" + --build-arg BUILD_DATE="$(date +%Y%m%d)" + --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG . + - docker push registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + - docker push registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG + # TODO: check/change substrate 1.0, polkadot 0.4, zcash, parity-pharma, parity-bitcoin, light and remove this image rust: @@ -71,7 +90,7 @@ rust: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-linux: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -81,7 +100,7 @@ parity-ci-linux: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-android: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: stretch @@ -91,7 +110,7 @@ parity-ci-android: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-i386: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -101,7 +120,7 @@ parity-ci-i386: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-arm64: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -111,7 +130,7 @@ parity-ci-arm64: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-armhf: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -121,7 +140,7 @@ parity-ci-armhf: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-docs: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -142,7 +161,7 @@ rust-builder: awscli: - <<: *docker_build + <<: &docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest diff --git a/dockerfiles/parity-ci-android/Dockerfile b/dockerfiles/parity-ci-android/Dockerfile index f3a01dba..99540625 100644 --- a/dockerfiles/parity-ci-android/Dockerfile +++ b/dockerfiles/parity-ci-android/Dockerfile @@ -57,7 +57,7 @@ RUN set -eux; \ # autotools-dev automake autoconf libtool docbook-xsl rustup target add arm-linux-androideabi; \ rustup target add armv7-linux-androideabi; \ - cargo install sccache; \ + cargo install sccache --features redis; \ # Android NDK and toolchain cd /usr/local; \ wget -q https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip; \ From 55b0eedbfa6430a9bfce65d6d1515a01d91e738b Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 14 Aug 2019 15:31:41 +0200 Subject: [PATCH 03/14] typo --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddc11192..d5bbdeb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ rust: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-linux: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -100,7 +100,7 @@ parity-ci-linux: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-android: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: stretch @@ -110,7 +110,7 @@ parity-ci-android: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-i386: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -120,7 +120,7 @@ parity-ci-i386: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-arm64: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -130,7 +130,7 @@ parity-ci-arm64: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-armhf: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -140,7 +140,7 @@ parity-ci-armhf: - $DOCKERIMAGE == $CI_JOB_NAME parity-ci-docs: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest @@ -161,7 +161,7 @@ rust-builder: awscli: - <<: &docker_build_to_own_reg + <<: *docker_build_to_own_reg variables: CONTAINER_IMAGE: $CI_JOB_NAME CONTAINER_TAG: latest From cbbef4ecd47023c69fad2d100053a0644df35712 Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 14 Aug 2019 23:34:08 +0200 Subject: [PATCH 04/14] another way to login --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5bbdeb3..964bce7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,8 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - - docker login registry.parity.io + # - docker login registry.parity.io + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker info script: - cd dockerfiles/$DOCKERFILE_DIR From e527c36ce3f75b4136caca7c598ca66b3639e74e Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 14 Aug 2019 23:51:26 +0200 Subject: [PATCH 05/14] inheritance fixed --- .gitlab-ci.yml | 5 ++--- dockerfiles/parity-ci-android/Dockerfile | 2 +- dockerfiles/parity-ci-arm64/Dockerfile | 4 ++-- dockerfiles/parity-ci-armhf/Dockerfile | 4 ++-- dockerfiles/parity-ci-i386/Dockerfile | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 964bce7a..3202da5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,6 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - # - docker login registry.parity.io - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker info script: @@ -75,8 +74,8 @@ variables: --build-arg BUILD_DATE="$(date +%Y%m%d)" --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG . - - docker push registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - - docker push registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG + - docker push $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + - docker push $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG # TODO: check/change substrate 1.0, polkadot 0.4, zcash, parity-pharma, parity-bitcoin, light and remove this image diff --git a/dockerfiles/parity-ci-android/Dockerfile b/dockerfiles/parity-ci-android/Dockerfile index 99540625..9390cf11 100644 --- a/dockerfiles/parity-ci-android/Dockerfile +++ b/dockerfiles/parity-ci-android/Dockerfile @@ -7,7 +7,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/parity-ci-android" \ + io.parity.image.title="registry.parity.io/pub/ci/parity-ci-android" \ io.parity.image.description="cmake rhash libudev-dev time xsltproc gperf; libudev.patch; \ android ndk r16b; cargo target arm-linux-androideabi, cargo target armv7-linux-androideabi" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-arm64/Dockerfile b/dockerfiles/parity-ci-arm64/Dockerfile index 01ef8dd9..b5faadac 100644 --- a/dockerfiles/parity-ci-arm64/Dockerfile +++ b/dockerfiles/parity-ci-arm64/Dockerfile @@ -1,4 +1,4 @@ -FROM parity/parity-ci-linux:latest as builder +FROM registry.parity.io/pub/ci/parity-ci-linux:latest as builder # metadata ARG VCS_REF @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/parity-ci-arm64" \ + io.parity.image.title="registry.parity.io/pub/ci/parity-ci-arm64" \ io.parity.image.description="g++-aarch64-linux-gnu gcc-aarch64-linux-gnu libudev-dev \ libudev-dev:arm64; rustup target aarch64-unknown-linux-gnu" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-armhf/Dockerfile b/dockerfiles/parity-ci-armhf/Dockerfile index d5a27ad8..9943fa56 100644 --- a/dockerfiles/parity-ci-armhf/Dockerfile +++ b/dockerfiles/parity-ci-armhf/Dockerfile @@ -1,4 +1,4 @@ -FROM parity/parity-ci-linux:latest as builder +FROM registry.parity.io/pub/ci/parity-ci-linux:latest as builder # metadata ARG VCS_REF @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/parity-ci-armhf" \ + io.parity.image.title="registry.parity.io/pub/ci/parity-ci-armhf" \ io.parity.image.description="g++-arm-linux-gnueabihf gcc-arm-linux-gnueabihf libudev-dev \ libudev-dev:armhf; cargo target armv7-unknown-linux-gnueabihf" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-i386/Dockerfile b/dockerfiles/parity-ci-i386/Dockerfile index 65c8ab1f..26f30f68 100644 --- a/dockerfiles/parity-ci-i386/Dockerfile +++ b/dockerfiles/parity-ci-i386/Dockerfile @@ -1,4 +1,4 @@ -FROM parity/parity-ci-linux:latest as builder +FROM registry.parity.io/pub/ci/parity-ci-linux:latest as builder # metadata ARG VCS_REF @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/parity-ci-i386" \ + io.parity.image.title="registry.parity.io/pub/ci/parity-ci-i386" \ io.parity.image.description="gcc-multilib g++-multilib libudev-dev libudev-dev:i386; \ cargo target i686-unknown-linux-gnu" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ From 18594855a68e0b56d05a592f3360e98068d0148f Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 00:06:22 +0200 Subject: [PATCH 06/14] not clear registry address --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3202da5a..3ff7a7e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY/pub/ci - docker info script: - cd dockerfiles/$DOCKERFILE_DIR @@ -72,8 +72,8 @@ variables: - docker build --no-cache --build-arg VCS_REF="${CI_COMMIT_SHA}" --build-arg BUILD_DATE="$(date +%Y%m%d)" - --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG . + --tag $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + --tag $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG . - docker push $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - docker push $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG From 351d26619aa650f780a5de490c1c406abb746206 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 00:15:25 +0200 Subject: [PATCH 07/14] not clear deploy token --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ff7a7e0..f6cc7251 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY/pub/ci + - docker login -u gitlab+deploy-token-8 -p $CI_DEPLOY_PASSWORD $CI_REGISTRY/pub/ci - docker info script: - cd dockerfiles/$DOCKERFILE_DIR From 59260a8e8d7cd9268232be9f7b8d49fa9bfc83f1 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 00:29:17 +0200 Subject: [PATCH 08/14] one another way to login --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6cc7251..4d73a784 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - - docker login -u gitlab+deploy-token-8 -p $CI_DEPLOY_PASSWORD $CI_REGISTRY/pub/ci + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker info script: - cd dockerfiles/$DOCKERFILE_DIR From 0085b5dab38e208fd97d2a403072878b943ecb58 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 00:43:23 +0200 Subject: [PATCH 09/14] yet another way to login --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d73a784..70da904f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/pub/ci/ - docker info script: - cd dockerfiles/$DOCKERFILE_DIR From 4125729a82d236b2eb160819d92503fbb80987cd Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 09:26:46 +0200 Subject: [PATCH 10/14] yet another 1 way to login --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70da904f..2ee2d7e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,9 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/pub/ci/ + # - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/pub/ci/ + - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.parity.io + # - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker info script: - cd dockerfiles/$DOCKERFILE_DIR From 015e0adf99b7e28ce5321c816e13b8c15a134373 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 09:53:16 +0200 Subject: [PATCH 11/14] maybe those are different registries --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ee2d7e3..e0fa871d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,10 +74,10 @@ variables: - docker build --no-cache --build-arg VCS_REF="${CI_COMMIT_SHA}" --build-arg BUILD_DATE="$(date +%Y%m%d)" - --tag $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - --tag $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG . - - docker push $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - - docker push $CI_REGISTRY/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG + --tag $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + --tag $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_TAG . + - docker push $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + - docker push $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_TAG # TODO: check/change substrate 1.0, polkadot 0.4, zcash, parity-pharma, parity-bitcoin, light and remove this image From 134d4a68e48fcf8feebc9003d84132557a348339 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 10:12:35 +0200 Subject: [PATCH 12/14] test all the ways to push --- .gitlab-ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0fa871d..7124e485 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,8 +62,8 @@ variables: <<: *docker_build before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - # - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/pub/ci/ - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.parity.io + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + # - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.parity.io # - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker info script: @@ -74,10 +74,14 @@ variables: - docker build --no-cache --build-arg VCS_REF="${CI_COMMIT_SHA}" --build-arg BUILD_DATE="$(date +%Y%m%d)" - --tag $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - --tag $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_TAG . - - docker push $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - - docker push $CI_REGISTRY/$CONTAINER_IMAGE:$CONTAINER_TAG + --tag $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + --tag $CI_REGISTRY/parity/infrastructure/scripts/$CONTAINER_IMAGE:$CONTAINER_TAG + --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG + --tag registry.parity.io/$CONTAINER_IMAGE:$CONTAINER_TAG . + - docker push $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG + - docker push $CI_REGISTRY/parity/infrastructure/scripts/$CONTAINER_IMAGE:$CONTAINER_TAG + - docker push registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG + - docker push registry.parity.io/$CONTAINER_IMAGE:$CONTAINER_TAG # TODO: check/change substrate 1.0, polkadot 0.4, zcash, parity-pharma, parity-bitcoin, light and remove this image From f0277d2eda7483460dcbd4f4851fff8fc0a69c29 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 10:36:38 +0200 Subject: [PATCH 13/14] figured out how to push --- .gitlab-ci.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7124e485..8dce364e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,25 +63,21 @@ variables: before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - # - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.parity.io - # - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker info script: + # $CI_REGISTRY_IMAGE == registry.parity.io/parity/infrastructure/scripts/ + # $CI_REGISTRY == registry.parity.io/ - cd dockerfiles/$DOCKERFILE_DIR - # - docker pull $CONTAINER_IMAGE:$CONTAINER_TAG || true - # - docker build --cache-from $CONTAINER_IMAGE:$CONTAINER_TAG --tag $CONTAINER_IMAGE:$CI_BUILD_REF --tag $CONTAINER_IMAGE:$CONTAINER_TAG . - - export CONTAINER_DATE_TAG="${CI_COMMIT_SHORT_SHA}-$(date +%Y%m%d)" + # - docker pull $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_TAG || true + - CONTAINER_DATE_TAG="${CI_COMMIT_SHORT_SHA}-$(date +%Y%m%d)" + # - docker build --cache-from $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_TAG - docker build --no-cache --build-arg VCS_REF="${CI_COMMIT_SHA}" --build-arg BUILD_DATE="$(date +%Y%m%d)" --tag $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - --tag $CI_REGISTRY/parity/infrastructure/scripts/$CONTAINER_IMAGE:$CONTAINER_TAG - --tag registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG - --tag registry.parity.io/$CONTAINER_IMAGE:$CONTAINER_TAG . + --tag $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_TAG . - docker push $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG - - docker push $CI_REGISTRY/parity/infrastructure/scripts/$CONTAINER_IMAGE:$CONTAINER_TAG - - docker push registry.parity.io/pub/ci/$CONTAINER_IMAGE:$CONTAINER_TAG - - docker push registry.parity.io/$CONTAINER_IMAGE:$CONTAINER_TAG + - docker push $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_TAG # TODO: check/change substrate 1.0, polkadot 0.4, zcash, parity-pharma, parity-bitcoin, light and remove this image From 7dba8a6bd59bd00777ff4a99318987d320cf86d9 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 15 Aug 2019 10:55:08 +0200 Subject: [PATCH 14/14] fixed addresses everywhere --- .gitlab-ci.yml | 1 - dockerfiles/awscli/Dockerfile | 2 +- dockerfiles/parity-ci-android/Dockerfile | 2 +- dockerfiles/parity-ci-android/README.md | 2 +- dockerfiles/parity-ci-arm64/Dockerfile | 4 ++-- dockerfiles/parity-ci-arm64/README.md | 2 +- dockerfiles/parity-ci-armhf/Dockerfile | 4 ++-- dockerfiles/parity-ci-armhf/README.md | 2 +- dockerfiles/parity-ci-docs/Dockerfile | 2 +- dockerfiles/parity-ci-i386/Dockerfile | 4 ++-- dockerfiles/parity-ci-i386/README.md | 2 +- dockerfiles/parity-ci-linux/Dockerfile | 2 +- dockerfiles/parity-ci-linux/README.md | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8dce364e..aed9a9f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,6 @@ variables: before_script: - test -z "$DOCKERIMAGE" && echo "DOCKERIMAGE must be defined" && exit 1 - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker info script: # $CI_REGISTRY_IMAGE == registry.parity.io/parity/infrastructure/scripts/ # $CI_REGISTRY == registry.parity.io/ diff --git a/dockerfiles/awscli/Dockerfile b/dockerfiles/awscli/Dockerfile index 5860e003..370e71f5 100644 --- a/dockerfiles/awscli/Dockerfile +++ b/dockerfiles/awscli/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/awscli" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/awscli" \ io.parity.image.description="awscli" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ dockerfiles/awscli/Dockerfile" \ diff --git a/dockerfiles/parity-ci-android/Dockerfile b/dockerfiles/parity-ci-android/Dockerfile index 9390cf11..bde532c6 100644 --- a/dockerfiles/parity-ci-android/Dockerfile +++ b/dockerfiles/parity-ci-android/Dockerfile @@ -7,7 +7,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="registry.parity.io/pub/ci/parity-ci-android" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/parity-ci-android" \ io.parity.image.description="cmake rhash libudev-dev time xsltproc gperf; libudev.patch; \ android ndk r16b; cargo target arm-linux-androideabi, cargo target armv7-linux-androideabi" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-android/README.md b/dockerfiles/parity-ci-android/README.md index 468d1c30..ba2893c8 100644 --- a/dockerfiles/parity-ci-android/README.md +++ b/dockerfiles/parity-ci-android/README.md @@ -4,7 +4,7 @@ Uses [sccache](https://github.com/mozilla/sccache). # Usage ```linux-armv7-android: stage: build - image: parity/parity-ci-android:stretch + image: registry.parity.io/parity/infrastructure/scripts/parity-ci-android:stretch script: - cargo build ... ``` diff --git a/dockerfiles/parity-ci-arm64/Dockerfile b/dockerfiles/parity-ci-arm64/Dockerfile index b5faadac..cfea02b3 100644 --- a/dockerfiles/parity-ci-arm64/Dockerfile +++ b/dockerfiles/parity-ci-arm64/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.parity.io/pub/ci/parity-ci-linux:latest as builder +FROM registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest as builder # metadata ARG VCS_REF @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="registry.parity.io/pub/ci/parity-ci-arm64" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/parity-ci-arm64" \ io.parity.image.description="g++-aarch64-linux-gnu gcc-aarch64-linux-gnu libudev-dev \ libudev-dev:arm64; rustup target aarch64-unknown-linux-gnu" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-arm64/README.md b/dockerfiles/parity-ci-arm64/README.md index 5c4294c4..fc18070e 100644 --- a/dockerfiles/parity-ci-arm64/README.md +++ b/dockerfiles/parity-ci-arm64/README.md @@ -5,7 +5,7 @@ Uses [sccache](https://github.com/mozilla/sccache). ``` build-linux-arm64: stage: build - image: parity/parity-ci-arm64:latest + image: registry.parity.io/parity/infrastructure/scripts/parity-ci-arm64:latest script: - cargo build build --target aarch64-unknown-linux-gnu $CARGO_OPTIONS ``` diff --git a/dockerfiles/parity-ci-armhf/Dockerfile b/dockerfiles/parity-ci-armhf/Dockerfile index 9943fa56..980735c1 100644 --- a/dockerfiles/parity-ci-armhf/Dockerfile +++ b/dockerfiles/parity-ci-armhf/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.parity.io/pub/ci/parity-ci-linux:latest as builder +FROM registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest as builder # metadata ARG VCS_REF @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="registry.parity.io/pub/ci/parity-ci-armhf" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/parity-ci-armhf" \ io.parity.image.description="g++-arm-linux-gnueabihf gcc-arm-linux-gnueabihf libudev-dev \ libudev-dev:armhf; cargo target armv7-unknown-linux-gnueabihf" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-armhf/README.md b/dockerfiles/parity-ci-armhf/README.md index 8ba07626..437b02ff 100644 --- a/dockerfiles/parity-ci-armhf/README.md +++ b/dockerfiles/parity-ci-armhf/README.md @@ -5,7 +5,7 @@ Uses [sccache](https://github.com/mozilla/sccache). ``` build-linux-armhf: stage: build - image: parity/parity-ci-armhf:latest + image: registry.parity.io/parity/infrastructure/scripts/parity-ci-armhf:latest script: - cargo build --target armv7-unknown-linux-gnueabihf $CARGO_OPTIONS ``` diff --git a/dockerfiles/parity-ci-docs/Dockerfile b/dockerfiles/parity-ci-docs/Dockerfile index f500a607..90b8e42b 100644 --- a/dockerfiles/parity-ci-docs/Dockerfile +++ b/dockerfiles/parity-ci-docs/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/parity-ci-docs" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/parity-ci-docs" \ io.parity.image.description="curl ca-certificates git; nodejs yarn" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ dockerfiles/parity-ci-docs/Dockerfile" \ diff --git a/dockerfiles/parity-ci-i386/Dockerfile b/dockerfiles/parity-ci-i386/Dockerfile index 26f30f68..539cf1f3 100644 --- a/dockerfiles/parity-ci-i386/Dockerfile +++ b/dockerfiles/parity-ci-i386/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.parity.io/pub/ci/parity-ci-linux:latest as builder +FROM registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest as builder # metadata ARG VCS_REF @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="registry.parity.io/pub/ci/parity-ci-i386" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/parity-ci-i386" \ io.parity.image.description="gcc-multilib g++-multilib libudev-dev libudev-dev:i386; \ cargo target i686-unknown-linux-gnu" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ diff --git a/dockerfiles/parity-ci-i386/README.md b/dockerfiles/parity-ci-i386/README.md index 4fa4fade..b75a78b0 100644 --- a/dockerfiles/parity-ci-i386/README.md +++ b/dockerfiles/parity-ci-i386/README.md @@ -5,7 +5,7 @@ Uses [sccache](https://github.com/mozilla/sccache). ``` build-linux-i386: stage: build - image: parity/parity-ci-i386:latest + image: registry.parity.io/parity/infrastructure/scripts/parity-ci-i386:latest script: - cargo build --target i686-unknown-linux-gnu $CARGO_OPTIONS ``` diff --git a/dockerfiles/parity-ci-linux/Dockerfile b/dockerfiles/parity-ci-linux/Dockerfile index b86cdb62..1187d7f0 100644 --- a/dockerfiles/parity-ci-linux/Dockerfile +++ b/dockerfiles/parity-ci-linux/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.title="parity/parity-ci-linux" \ + io.parity.image.title="registry.parity.io/parity/infrastructure/scripts/parity-ci-linux" \ io.parity.image.description="curl git make cmake ca-certificates g++ rhash gcc \ pkg-config libudev-dev time libssl-dev libc6-dev \ rust stable/beta/nightly, cargo-audit, sccache" \ diff --git a/dockerfiles/parity-ci-linux/README.md b/dockerfiles/parity-ci-linux/README.md index 89cfa5ac..d904018c 100644 --- a/dockerfiles/parity-ci-linux/README.md +++ b/dockerfiles/parity-ci-linux/README.md @@ -13,7 +13,7 @@ Usage: ``` build-linux: stage: build - image: parity/parity-ci-linux:latest + image: registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest script: - cargo build ... ```