2 Commits

Author SHA1 Message Date
00e348a24c fix 2021-03-08 18:33:35 +01:00
17dd6d6718 new ci 2021-03-08 18:28:00 +01:00
3 changed files with 34 additions and 13 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

@ -1,4 +1,4 @@
FROM debian:bullseye FROM debian:buster
LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>" 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"
@ -12,13 +12,12 @@ RUN \
apt-get install -y make && \ apt-get install -y make && \
apt-get install -y openssh-client && \ apt-get install -y openssh-client && \
apt-get install -y git && \ apt-get install -y git && \
apt-get install -y python3 && \ apt-get install -y python && \
update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 && \ apt-get install -y python-requests && \
apt-get install -y python3-requests && \ apt-get install -y python-pycodestyle && \
apt-get install -y python3-pycodestyle && \ apt-get install -y python-yaml && \
apt-get install -y python3-yaml && \ apt-get install -y python-pip && \
apt-get install -y python3-pip && \ apt-get install -y python-xmltodict && \
apt-get install -y python3-xmltodict && \
apt-get install -y gpg && \ apt-get install -y gpg && \
apt-get install -y apt-transport-https && \ apt-get install -y apt-transport-https && \
apt-get install -y wget && \ apt-get install -y wget && \

View File

@ -1,6 +1,6 @@
## Base image for build containers ## Base image for build containers
Based on Debian ~~Buster~~ Bullseye Based on Debian Buster
Contains additionally: Contains additionally:
* make * make
@ -12,9 +12,5 @@ Contains additionally:
* wget and curl * wget and curl
* zip, unzip and 7z * zip, unzip and 7z
* vim.tiny * vim.tiny
* ps
* doxygen
* GitLab release tool: https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader including validator for semantic version according to https://semver.org/ * GitLab release tool: https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader including validator for semantic version according to https://semver.org/
Switched to Python 3