6 Commits
1.1.0 ... 1.4.1

Author SHA1 Message Date
1ed81f227a add jq here too 2021-05-26 11:28:08 +02:00
e4503589e2 add ca package 2021-03-11 12:18:24 +01:00
00e348a24c fix 2021-03-08 18:33:35 +01:00
17dd6d6718 new ci 2021-03-08 18:28:00 +01:00
964ad65e27 add doxygen and procps 2021-01-28 14:51:01 +01:00
9eee846ef9 new gitlab release tool 2021-01-13 18:18:48 +01:00
2 changed files with 51 additions and 19 deletions

View File

@ -2,3 +2,29 @@ include:
- project: dockerized/commons - project: dockerized/commons
ref: master ref: master
file: gitlab-ci-template.yml 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_NAME
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}

View File

@ -4,28 +4,33 @@ LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
LABEL ImageName="registry.hottis.de/dockerized/base-build-env" LABEL ImageName="registry.hottis.de/dockerized/base-build-env"
LABEL AlternativeImageName="wollud1969/base-build-env" LABEL AlternativeImageName="wollud1969/base-build-env"
ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/f840b97a0eb64d1de2a6d6d1d4d1529e/GitlabReleaseTool.zip" ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/f97b219a1df1910822b9936a8236dfbd/GitlabReleaseTool.zip"
RUN \ RUN \
apt-get update && \ apt update && \
apt-get install -y make && \ apt upgrade -y && \
apt-get install -y openssh-client && \ apt install -y ca-certificates && \
apt-get install -y git && \ apt install -y make && \
apt-get install -y python && \ apt install -y openssh-client && \
apt-get install -y python-requests && \ apt install -y git && \
apt-get install -y python-pycodestyle && \ apt install -y python && \
apt-get install -y python-yaml && \ apt install -y python-requests && \
apt-get install -y python-pip && \ apt install -y python-pycodestyle && \
apt-get install -y python-xmltodict && \ apt install -y python-yaml && \
apt-get install -y gpg && \ apt install -y python-pip && \
apt-get install -y apt-transport-https && \ apt install -y python-xmltodict && \
apt-get install -y wget && \ apt install -y gpg && \
apt-get install -y curl && \ apt install -y apt-transport-https && \
apt-get install -y unzip && \ apt install -y wget && \
apt-get install -y zip && \ apt install -y curl && \
apt-get install -y vim.tiny && \ apt install -y unzip && \
apt-get install -y p7zip-full && \ apt install -y zip && \
apt install -y vim.tiny && \
apt install -y p7zip-full && \
apt install -y procps && \
apt install -y doxygen && \
apt install -y jq && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
cd /tmp && \ cd /tmp && \
wget $RELEASETOOL_URL && \ wget $RELEASETOOL_URL && \
@ -36,3 +41,4 @@ RUN \
mv gitlabreleaseuploader.py /usr/bin && \ mv gitlabreleaseuploader.py /usr/bin && \
mv deleterelease.py /usr/bin && \ mv deleterelease.py /usr/bin && \
mv checksemver.py /usr/bin mv checksemver.py /usr/bin