Compare commits
2 Commits
1.4.0
...
1.3.1-bull
Author | SHA1 | Date | |
---|---|---|---|
a2bd559e19 | |||
a64be0c66a |
@ -2,29 +2,3 @@ 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}
|
|
||||||
|
|
||||||
|
46
Dockerfile
46
Dockerfile
@ -1,4 +1,4 @@
|
|||||||
FROM debian:buster
|
FROM debian:bullseye
|
||||||
|
|
||||||
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"
|
||||||
@ -8,28 +8,27 @@ ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseupload
|
|||||||
|
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
apt update && \
|
apt-get update && \
|
||||||
apt upgrade -y && \
|
apt-get install -y make && \
|
||||||
apt install -y ca-certificates && \
|
apt-get install -y openssh-client && \
|
||||||
apt install -y make && \
|
apt-get install -y git && \
|
||||||
apt install -y openssh-client && \
|
apt-get install -y python3 && \
|
||||||
apt install -y git && \
|
update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 && \
|
||||||
apt install -y python && \
|
apt-get install -y python3-requests && \
|
||||||
apt install -y python-requests && \
|
apt-get install -y python3-pycodestyle && \
|
||||||
apt install -y python-pycodestyle && \
|
apt-get install -y python3-yaml && \
|
||||||
apt install -y python-yaml && \
|
apt-get install -y python3-pip && \
|
||||||
apt install -y python-pip && \
|
apt-get install -y python3-xmltodict && \
|
||||||
apt install -y python-xmltodict && \
|
apt-get install -y gpg && \
|
||||||
apt install -y gpg && \
|
apt-get install -y apt-transport-https && \
|
||||||
apt install -y apt-transport-https && \
|
apt-get install -y wget && \
|
||||||
apt install -y wget && \
|
apt-get install -y curl && \
|
||||||
apt install -y curl && \
|
apt-get install -y unzip && \
|
||||||
apt install -y unzip && \
|
apt-get install -y zip && \
|
||||||
apt install -y zip && \
|
apt-get install -y vim.tiny && \
|
||||||
apt install -y vim.tiny && \
|
apt-get install -y p7zip-full && \
|
||||||
apt install -y p7zip-full && \
|
apt-get install -y procps && \
|
||||||
apt install -y procps && \
|
apt-get install -y doxygen && \
|
||||||
apt install -y doxygen && \
|
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
cd /tmp && \
|
cd /tmp && \
|
||||||
wget $RELEASETOOL_URL && \
|
wget $RELEASETOOL_URL && \
|
||||||
@ -40,4 +39,3 @@ 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
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
## Base image for build containers
|
## Base image for build containers
|
||||||
|
|
||||||
Based on Debian Buster
|
Based on Debian ~~Buster~~ Bullseye
|
||||||
|
|
||||||
Contains additionally:
|
Contains additionally:
|
||||||
* make
|
* make
|
||||||
@ -12,5 +12,9 @@ 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
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user