ci: added systemd to devenv container, enabled docker image build job

diff --git a/manager/.gitlab-ci.yml b/manager/.gitlab-ci.yml
index 49a976895b2ebefe5bf5f4d98356e3a874866856..f427e0b1ee32a77754c0d74819821c4f70ead453 100644 (file)
--- a/manager/.gitlab-ci.yml
+++ b/manager/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 stages:
-  - build
+  - image
   - check
 
 image: registry.nic.cz/knot/knot-resolver-manager/devenv:latest
@@ -10,17 +10,20 @@ image: registry.nic.cz/knot/knot-resolver-manager/devenv:latest
 # Sadly, it does not work on our infrastructure. I did not however test it thoroughly and/or consulted it with
 # anyone else. So it might be fixable. For now, let's leave the config here and we might fix it in the future.
 #
-# build:
-#   image: docker:19.03.12
-#   stage: build
-#   services:
-#     - docker:19.03.12-dind
-#   variables:
-#     IMAGE_TAG: $CI_REGISTRY/knot/knot-resolver-manager/ci/devenv:latest
-#   script:
-#     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-#     - docker build -t $IMAGE_TAG ci/devenv
-#     - docker push $IMAGE_TAG
+build:
+  image: docker:20-dind
+  stage: image
+  when: manual
+  tags:
+    - dind
+  variables:
+    IMAGE_TAG: $CI_REGISTRY/knot/knot-resolver-manager/devenv:latest
+  before_script:
+    - docker info
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker build -t $IMAGE_TAG ci/devenv
+    - docker push $IMAGE_TAG
 
 
 # agressively cache Poetry's and NPM's data

diff --git a/manager/ci/devenv/Dockerfile b/manager/ci/devenv/Dockerfile
index a51e16f956b154ddfb4de6b915991ffe541dffc3..4d80556fe7962f9f9ade2f4b443bebcc2519bef7 100644 (file)
--- a/manager/ci/devenv/Dockerfile
+++ b/manager/ci/devenv/Dockerfile
@@ -51,4 +51,6 @@ ENV POETRY_VIRTUALENVS_IN_PROJECT=true
 # install additional project dependencies
 USER root
 RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y libcairo2-dev libglib2.0-0 libgirepository1.0-dev
+RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y systemd
 USER user
+