add to sccache features redis

.gitlab-ci.yml

@@ -58,6 +58,26 @@ 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 -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+    # $CI_REGISTRY_IMAGE == registry.parity.io/parity/infrastructure/scripts/
+    # $CI_REGISTRY == registry.parity.io/
+    - cd dockerfiles/$DOCKERFILE_DIR
+    # - 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_IMAGE/$CONTAINER_IMAGE:$CONTAINER_TAG .
+    - docker push $CI_REGISTRY_IMAGE/$CONTAINER_IMAGE:$CONTAINER_DATE_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
 rust:
@@ -71,7 +91,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 +101,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 +111,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 +121,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 +131,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 +141,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 +162,7 @@ rust-builder:
 
 
 awscli:
-  <<: *docker_build
+  <<:                              *docker_build_to_own_reg
   variables:
     CONTAINER_IMAGE:               $CI_JOB_NAME
     CONTAINER_TAG:                 latest

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" \

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/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}/\
@@ -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; \

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 ...
 ```

dockerfiles/parity-ci-arm64/Dockerfile

@@ -1,12 +1,12 @@
-FROM parity/parity-ci-linux:latest as builder
+FROM registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest as builder
 
 # metadata
 ARG VCS_REF
 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/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}/\

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
 ```

dockerfiles/parity-ci-armhf/Dockerfile

@@ -1,12 +1,12 @@
-FROM parity/parity-ci-linux:latest as builder
+FROM registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest as builder
 
 # metadata
 ARG VCS_REF
 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/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}/\

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
 ```

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" \

dockerfiles/parity-ci-i386/Dockerfile

@@ -1,12 +1,12 @@
-FROM parity/parity-ci-linux:latest as builder
+FROM registry.parity.io/parity/infrastructure/scripts/parity-ci-linux:latest as builder
 
 # metadata
 ARG VCS_REF
 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/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}/\

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
 ```

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" \
@@ -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; \

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 ...
 ```