Merge branch 'image-migration' into 'dev'

Image migration Closes #7 See merge request noris-network/koris!6
noris-network · Nov 20, 2019 · 4f2619b · 4f2619b
2 parents ac1ca70 + 284ba48
commit 4f2619b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+image: registry.gitlab.com/noris-network/koris/koris-alpine:0.1.6
+
 stages:
  - static-analysis
  - unittest
@@ -15,22 +17,19 @@ stages:
 # --[ STATIC ANALYSIS ]--
 static-analysis-python:
   stage: static-analysis
-  image: registry.gitlab.com/noris-network/koris/koris-alpine:0.1.6
   script:
     - pylint --version
     - make lint
 
 static-analysis-bash:
   stage: static-analysis
-  image: registry.gitlab.com/noris-network/koris/koris-alpine:0.1.6
   script:
     - make test-bash
 
 
 # --[ UNIT TESTS ]--
 unittest:
   stage: unittest
-  image: oz123/koris-alpine:0.1.6
   script:
     - "pip3 install -r requirements_ci.txt"
     - pip3 install -q -e .
@@ -50,7 +49,6 @@ unittest:
 # --[ WAIT FOR RESOURCES ]--
 wait-for-resources:
   stage: wait-for-resources
-  image: oz123/koris-alpine:0.1.6
   script:
    - "pip3 install -r requirements_ci.txt"
    - pip3 install -q -e .
@@ -78,7 +76,6 @@ wait-for-resources:
 
 build-cluster:
   stage: build-cluster
-  image: oz123/koris-alpine:0.1.6
   script:
   - "pip3 install -r requirements_ci.txt"
   - "pip3 install -q -e ."
@@ -99,7 +96,6 @@ build-cluster:
 
 build-cluster-with-vanilla-image:
   stage: build-cluster
-  image: oz123/koris-alpine:0.1.6
   script:
   - "pip3 install -r requirements_ci.txt"
   - "pip3 install -q -e ."
@@ -117,7 +113,6 @@ build-cluster-with-vanilla-image:
 
 integration-test:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -154,7 +149,6 @@ check-dns:
 
 check-cinder:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -185,7 +179,6 @@ check-members:
 
 assert-control-plane:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -200,7 +193,6 @@ assert-control-plane:
 
 check-node-labels:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -217,7 +209,6 @@ check-node-labels:
 
 add-nodes:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -242,7 +233,6 @@ add-nodes:
 
 add-master:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -272,7 +262,6 @@ add-master:
 
 check-added-node-labels:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -290,7 +279,6 @@ check-added-node-labels:
 
 assert-metrics-server-is-running:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -320,7 +308,6 @@ check-added-nodes-ready:
 
 check-nginx-ingress-ready:
   stage: integration-test
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -366,7 +353,6 @@ delete-added-nodes:
 
 delete-added-master:
   stage: resize-delete
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -453,7 +439,6 @@ compliance-checks:
 # --[ CLEANUP ]--
 cleanup:
   stage: cleanup
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -475,7 +460,6 @@ cleanup:
 
 clean-vanilla-cluster:
   stage: cleanup
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -508,7 +492,6 @@ clean-vanilla-cluster:
 
 clean-cinder-volumes:
   stage: cleanup
-  image: oz123/koris-alpine:0.1.6
   variables:
     LC_ALL: "C.UTF-8"
     LANG: "C.UTF-8"
@@ -525,7 +508,6 @@ clean-cinder-volumes:
 # --[ COVERAGE REPORT ]--
 coverage-report:
   stage: coverage-report
-  image: oz123/koris-alpine:0.1.6
   script:
    - "pip3 install -r requirements_ci.txt"
    - pip3 install -q -e .
@@ -547,7 +529,6 @@ coverage-report:
 # --[ PAGES ]--
 dev-docs:
   stage: pages
-  image: oz123/koris-alpine:0.1.6
   script:
   - pip3 install sphinx sphinx_rtd_theme sphinx_autobuild
   - pip3 install .
@@ -567,7 +548,6 @@ dev-docs:
 
 pages:
   stage: pages
-  image: oz123/koris-alpine:0.1.6
   script:
   - pip3 install sphinx sphinx_rtd_theme sphinx_autobuild
   - which sphinx-build
@@ -583,6 +563,8 @@ pages:
 
 
 # --[ BUILD ]--
+# build this image with
+# sudo make docker-build-pyinstaller TAG=0.3.1 ORG=registry.gitlab.com/noris-network/koris
 build:
   stage: build
   image: oz123/koris-builder:0.3

diff --git a/Makefile b/Makefile
@@ -388,7 +388,7 @@ build-exec: ## build a single file executable of koris
 	pyinstaller koris.spec
 
 build-exec-in-docker:
-	docker run --rm -w /usr/src -v $(PWD):/usr/src/ $(ORG)/koris-builder:$(TAG) bash -c "make install build-exec PY=python3.6"
+	docker run --rm -w /usr/src -v $(CURDIR):/usr/src/ $(ORG)/koris-builder:$(TAG) bash -c "make install build-exec PY=python3.6"
 
 start-release:
 	make -f release.mk $@  # $@ is the name of the target

diff --git a/docker/Docker-pyinstaller-builder b/docker/Docker-pyinstaller-builder
@@ -14,7 +14,7 @@ ADD requirements.txt .
 ADD requirements_ci.txt .
 
 RUN pip3.6 install -r requirements.txt -r requirements_ci.txt
-RUN cp /usr/bin/python3.6 /usr/bin/python3
+#RUN cp /usr/bin/python3.6 /usr/bin/python3
 
 # uncomment these two lines for local builds - never push an image
 # with these line uncommented, because this breaks the build in gitlab