Repository refactor/restructure/cleanup

.gitlab-ci.yml

@@ -42,156 +42,151 @@ variables:
     - docker login -u "${Docker_Hub_User_Parity}" -p "${Docker_Hub_Pass_Parity}"
     - docker info
   script:
-    - cd $DOCKERFILE_DIR
+    - 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 $CONTAINER_IMAGE:$CONTAINER_DATE_TAG
-        --tag $CONTAINER_IMAGE:$CONTAINER_TAG .
-    - docker push $CONTAINER_IMAGE:$CONTAINER_DATE_TAG
-    - docker push $CONTAINER_IMAGE:$CONTAINER_TAG
+        --tag parity/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG
+        --tag parity/$CONTAINER_IMAGE:$CONTAINER_TAG .
+    - docker push parity/$CONTAINER_IMAGE:$CONTAINER_DATE_TAG
+    - docker push parity/$CONTAINER_IMAGE:$CONTAINER_TAG
   after_script:
     - docker logout
   environment:
     name: parity-build
 
 
-# Deprecated, used only for substrate 1.0 and polkadot 0.4
-parity/rust:
+# TODO: check/change substrate 1.0, polkadot 0.4, zcash, parity-pharma, parity-bitcoin, light and remove this image
+rust:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: $CI_JOB_NAME
-    CONTAINER_TAG:   nightly
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/rustup
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 nightly
+    DOCKERFILE_DIR:                rustup
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
 
-parity/parity-ci-linux:
+parity-ci-linux:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: $CI_JOB_NAME
-    CONTAINER_TAG:   latest
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/parity-ci-linux
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
 
-parity/rust-parity-ethereum-android-build:
+parity-ci-android:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: $CI_JOB_NAME
-    CONTAINER_TAG:   stretch
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/cross/android
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 stretch
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
 
-rust-parity-ethereum-build:i386:
+parity-ci-i386:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: parity/rust-parity-ethereum-build
-    CONTAINER_TAG:   i386
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/cross/i686
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
-      - $DOCKERIMAGE == "parity/rust-parity-ethereum-build"
+      - $DOCKERIMAGE == $CI_JOB_NAME
 
-rust-parity-ethereum-build:arm64:
+parity-ci-arm64:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: parity/rust-parity-ethereum-build
-    CONTAINER_TAG:   arm64
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/cross/arm64
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
-      - $DOCKERIMAGE == "parity/rust-parity-ethereum-build"
+      - $DOCKERIMAGE == $CI_JOB_NAME
 
-rust-parity-ethereum-build:armhf:
+parity-ci-armhf:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: parity/rust-parity-ethereum-build
-    CONTAINER_TAG:   armhf
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/cross/armv7
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
-      - $DOCKERIMAGE == "parity/rust-parity-ethereum-build"
+      - $DOCKERIMAGE == $CI_JOB_NAME
 
-parity/rust-parity-ethereum-docs:
+parity-ci-docs:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: $CI_JOB_NAME
-    CONTAINER_TAG:   xenial
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/parity-eth-linux-docs
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
 
-parity/rust-builder:
+rust-builder:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE: $CI_JOB_NAME
-    CONTAINER_TAG:   latest
-    DOCKERFILE_DIR:  docker-files-for-Gitlab-CI-rust/rust-builder
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
 
 
-
-# helpers
-
-parity/awscli:
+awscli:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE:     $CI_JOB_NAME
-    CONTAINER_TAG:       latest
-    DOCKERFILE_DIR:      docker/helpers/awscli
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
-      - $DOCKERIMAGE == "awscli"
 
-parity/tools:
+tools:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE:     $CI_JOB_NAME
-    CONTAINER_TAG:       latest
-    DOCKERFILE_DIR:      docker/helpers/tools
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
-      - $DOCKERIMAGE == "tools"
 
 # special case as version tags are introduced
-parity/kubetools:
+kubetools:
   <<: *docker_build
   variables:
-    CONTAINER_IMAGE:         $CI_JOB_NAME
-    CONTAINER_TAG:           latest
-    DOCKERFILE_DIR:          docker/helpers/kubetools
+    CONTAINER_IMAGE:               $CI_JOB_NAME
+    CONTAINER_TAG:                 latest
+    DOCKERFILE_DIR:                $CI_JOB_NAME
     # https://github.com/kubernetes/kubernetes/releases
-    KUBE_VERSION:            "1.13.6"
+    KUBE_VERSION:                  "1.13.6"
     # https://github.com/kubernetes/helm/releases
-    HELM_VERSION:            "2.13.1"
+    HELM_VERSION:                  "2.13.1"
   only:
     variables:
       - $DOCKERIMAGE == $CI_JOB_NAME
       - $DOCKERIMAGE == "kubetools"
   script:
-    - cd $DOCKERFILE_DIR
+    - cd dockerfiles/$DOCKERFILE_DIR
     - docker build
       --build-arg VCS_REF="${CI_COMMIT_SHA}"
       --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
       --build-arg KUBE_VERSION="${KUBE_VERSION}"
       --build-arg HELM_VERSION="${HELM_VERSION}"
-      --tag $CONTAINER_IMAGE:$CONTAINER_TAG
-      --tag $CONTAINER_IMAGE:$HELM_VERSION .
-    - docker push $CONTAINER_IMAGE:$CONTAINER_TAG
-    - docker push $CONTAINER_IMAGE:$HELM_VERSION
+      --tag parity/$CONTAINER_IMAGE:$CONTAINER_TAG
+      --tag parity/$CONTAINER_IMAGE:$HELM_VERSION .
+    - docker push parity/$CONTAINER_IMAGE:$CONTAINER_TAG
+    - docker push parity/$CONTAINER_IMAGE:$HELM_VERSION
 
 
 

README.md

@@ -10,29 +10,22 @@ Download, verify and install
 
 
 ## Dockerfiles for images used in GitLab CI
-[Documentation](docker-files-for-Gitlab-CI-rust/README.md).
-
- - rust image
+[Documentation](dockerfiles/README.md).
+Rust and tools for:
+ - Substrate-based projects CIs
+ - parity-ethereum
  - android
- - arm
  - arm64
  - armv7
- - centos
- - debian
  - i686
- - snapcraft
+ - docs autogeneration
+ - various tools
+ - tools for kubernetes
 
 
 ## GitLab CI for building docker images
 
-Pipelines can only be triggered manually for now. For that go to the projects 
-CI/CD -> Pipelines menu and click "Run Pipeline". Variables have to be given 
-to select the image to build. E.g.
-
-```
-DOCKERIMAGE="rust"
-DOCKERTAG="nightly"
-```
-
-Docker image parity/rust:nightly is set up to be rebuild every night.
-
+Pipelines are triggered by schedule. Can be launched manually though.
+To launch the pipeline go to the project's CI/CD -> Schedules menu.
+To change, edit/create the new schedule: 
+    set the required variable and cron schedule.