From 17dd6d67186d4710b66043da427e9a9de1953977 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 8 Mar 2021 18:28:00 +0100 Subject: [PATCH 1/6] new ci --- .gitlab-ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e5f3a9..2d86794 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,3 +2,29 @@ include: - project: dockerized/commons ref: master file: gitlab-ci-template.yml + +stages: + - check + - build + - krohnify + +variables: + NEXUS_REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne + NEXUS_IMAGE_NAME: $NEXUS_REGISTRY/$CI_PROJECT_PATH + +krohnify: + image: registry.hottis.de/dockerized/docker-bash:latest + stage: krohnify + tags: + - krohne + - linux + - docker + only: + - tags + script: + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker pull $IMAGE_NAME:${CI_COMMIT_TAG} + - docker tag $IMAGE_NAME:${CI_COMMIT_TAG} $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG} + - docker login $NEXUS_REGISTRY --username $NEXUS_USER --password $NEXUS_PASSWORD + - docker push $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG} + From 00e348a24c45298dc17ca612de8c93e124a86abe Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 8 Mar 2021 18:33:35 +0100 Subject: [PATCH 2/6] fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d86794..799f260 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ stages: variables: NEXUS_REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne - NEXUS_IMAGE_NAME: $NEXUS_REGISTRY/$CI_PROJECT_PATH + NEXUS_IMAGE_NAME: $NEXUS_REGISTRY/$CI_PROJECT_NAME krohnify: image: registry.hottis.de/dockerized/docker-bash:latest From e4503589e2652899419cc1468ab4038118f2bc47 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 11 Mar 2021 12:18:24 +0100 Subject: [PATCH 3/6] add ca package --- Dockerfile | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index a13c703..9b8dd5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,26 +8,28 @@ ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseupload RUN \ - apt-get update && \ - apt-get install -y make && \ - apt-get install -y openssh-client && \ - apt-get install -y git && \ - apt-get install -y python && \ - apt-get install -y python-requests && \ - apt-get install -y python-pycodestyle && \ - apt-get install -y python-yaml && \ - apt-get install -y python-pip && \ - apt-get install -y python-xmltodict && \ - apt-get install -y gpg && \ - apt-get install -y apt-transport-https && \ - apt-get install -y wget && \ - apt-get install -y curl && \ - apt-get install -y unzip && \ - apt-get install -y zip && \ - apt-get install -y vim.tiny && \ - apt-get install -y p7zip-full && \ - apt-get install -y procps && \ - apt-get install -y doxygen && \ + apt update && \ + apt upgrade -y && \ + apt install -y ca-certificates && \ + apt install -y make && \ + apt install -y openssh-client && \ + apt install -y git && \ + apt install -y python && \ + apt install -y python-requests && \ + apt install -y python-pycodestyle && \ + apt install -y python-yaml && \ + apt install -y python-pip && \ + apt install -y python-xmltodict && \ + apt install -y gpg && \ + apt install -y apt-transport-https && \ + apt install -y wget && \ + apt install -y curl && \ + apt install -y unzip && \ + apt install -y zip && \ + apt install -y vim.tiny && \ + apt install -y p7zip-full && \ + apt install -y procps && \ + apt install -y doxygen && \ rm -rf /var/lib/apt/lists/* && \ cd /tmp && \ wget $RELEASETOOL_URL && \ @@ -38,3 +40,4 @@ RUN \ mv gitlabreleaseuploader.py /usr/bin && \ mv deleterelease.py /usr/bin && \ mv checksemver.py /usr/bin + From 1ed81f227ab6c9d18ff220456fbeefed07c8df2e Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 26 May 2021 11:28:08 +0200 Subject: [PATCH 4/6] add jq here too --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9b8dd5e..b98464b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ RUN \ apt install -y p7zip-full && \ apt install -y procps && \ apt install -y doxygen && \ + apt install -y jq && \ rm -rf /var/lib/apt/lists/* && \ cd /tmp && \ wget $RELEASETOOL_URL && \ From 8849562ef226dabfb3605a65fb259b2f03e852ec Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 2 Aug 2021 17:20:13 +0200 Subject: [PATCH 5/6] use python 3 --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b98464b..c3887f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,12 +14,12 @@ RUN \ apt install -y make && \ apt install -y openssh-client && \ apt install -y git && \ - apt install -y python && \ - apt install -y python-requests && \ - apt install -y python-pycodestyle && \ - apt install -y python-yaml && \ - apt install -y python-pip && \ - apt install -y python-xmltodict && \ + apt install -y python3 && \ + apt install -y python3-requests && \ + apt install -y python3-pycodestyle && \ + apt install -y python3-yaml && \ + apt install -y python3-pip && \ + apt install -y python3-xmltodict && \ apt install -y gpg && \ apt install -y apt-transport-https && \ apt install -y wget && \ From 7368b1d9aadc1d89693ab4d30692d49f40ceb89e Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 2 Aug 2021 17:31:11 +0200 Subject: [PATCH 6/6] add cheetah --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index c3887f1..aad1291 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,9 @@ RUN \ apt install -y doxygen && \ apt install -y jq && \ rm -rf /var/lib/apt/lists/* && \ + ln -s /usr/bin/python3 /usr/bin/python && \ + ln -s /usr/bin/pip3 /usr/bin/pip && \ + pip install Cheetah3 && \ cd /tmp && \ wget $RELEASETOOL_URL && \ unzip GitlabReleaseTool.zip && \