add dockerfiles dir

update README.md
paritytech · Dec 13, 2019 · 7a1fb5d · 7a1fb5d
1 parent 193f887
commit 7a1fb5d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -44,6 +44,7 @@ variables:
   script:
     # - 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 .
+    - cd dockerfiles/
     - export CONTAINER_DATE_TAG="${CI_COMMIT_SHORT_SHA}-$(date +%Y%m%d)"
     - docker build --no-cache
         --build-arg VCS_REF="${CI_COMMIT_SHA}"
@@ -69,6 +70,7 @@ variables:
     # - 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
+    - cd dockerfiles/
     - docker build --no-cache
         --build-arg VCS_REF="${CI_COMMIT_SHA}"
         --build-arg BUILD_DATE="$(date +%Y%m%d)"
@@ -237,6 +239,7 @@ kubetools:
       | HELM_VERSION = ${BUILD_HELM_VERSION}
       |
       EOT
+    - cd dockerfiles/
     - docker build
       --build-arg VCS_REF="${CI_COMMIT_SHA}"
       --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"

diff --git a/dockerfiles/README.md b/dockerfiles/README.md
@@ -3,16 +3,14 @@ Rust 1.39.0
 The current version of cmake is [3.16.0](https://github.com/Kitware/CMake/tree/v3.16.0)
 
 For installation in our images we use the version hosted on github. Check the hash sum taken from the file with [sha256 hashes](https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-SHA-256.txt) and verify the [install script](https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-Linux-x86_64.sh).
-If everything is correct, continue to build the image.
+If everything is correct, copy this file to utility folder and rename it to cmake.sh.
 ```
 # download cmake
-ADD "https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-Linux-x86_64.sh" cmake.sh
+cd utility;
+wget https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-Linux-x86_64.sh cp cmake-3.16.0-Linux-x86_64.sh cmake.sh
 # install cmake
-RUN echo "c87dc439a8d6b1b368843c580f0f92770ed641af8ff8fe0b706cfa79eed3ac91 cmake.sh" | sha256sum -c - || exit 1; \
-	chmod +x cmake.sh; \
-	./cmake.sh --skip-license --prefix=/usr/ --exclude-subdir; \
-  	rm cmake.sh
-
+echo "c87dc439a8d6b1b368843c580f0f92770ed641af8ff8fe0b706cfa79eed3ac91 cmake.sh" | sha256sum -c - || exit 1;
+chmod +x cmake.sh;
 ```
 
 For Windows CI

diff --git a/dockerfiles/utility/README.md b/dockerfiles/utility/README.md
@@ -0,0 +1,3 @@
+clang9.key - key for install clang9 from [https://apt.llvm.org](https://apt.llvm.org)
+
+cmake.sh - stable version cmake from [https://github.com/Kitware/CMake/releases](https://github.com/Kitware/CMake/releases)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		clang9.key - key for install clang9 from [https://apt.llvm.org](https://apt.llvm.org)

		cmake.sh - stable version cmake from [https://github.com/Kitware/CMake/releases](https://github.com/Kitware/CMake/releases)