new ci approach

This commit is contained in:
Wolfgang Hottgenroth 2021-10-28 11:38:59 +02:00
parent 6ca9c2ad48
commit db8d422cf9
5 changed files with 45 additions and 24 deletions

View File

@ -1,4 +1,39 @@
include:
- project: dockerized/commons
ref: master
file: gitlab-ci-template.yml
stages:
- build
variables:
IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
HUB_IMAGE_NAME: $DOCKER_HUB_LOGIN/$CI_PROJECT_NAME
build:
image: registry.hottis.de/dockerized/docker-bash:latest
stage: build
tags:
- hottis
- linux
- docker
only:
- publish
script:
- VERSION=`cat VERSION`
- UPSTREAM_RELEASE_TAG=`cat UPSTREAM_RELEASE_TAG`
- docker build --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
--tag $IMAGE_NAME:latest
--tag $IMAGE_NAME:${VERSION}-${UPSTREAM_RELEASE_TAG}
--tag $IMAGE_NAME:${VERSION}
.
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
- docker push $IMAGE_NAME:latest
- docker push $IMAGE_NAME:${VERSION}-${UPSTREAM_RELEASE_TAG}
- docker push $IMAGE_NAME:${VERSION}
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
- docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
- docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:latest
- docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:${VERSION}-${UPSTREAM_RELEASE_TAG}
- docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:${VERSION}
- docker push $HUB_IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
- docker push $HUB_IMAGE_NAME:latest
- docker push $HUB_IMAGE_NAME:${VERSION}-${UPSTREAM_RELEASE_TAG}
- docker push $HUB_IMAGE_NAME:${VERSION}

View File

@ -1,5 +1,8 @@
FROM alpine:3.13 AS builder
ARG UNBOUND_TAG="this_invalid_tag_certainly_does_not_exist"
ARG UNBOUND_CLONE_URL="https://github.com/NLnetLabs/unbound.git"
RUN \
apk update && \
apk add alpine-sdk && \
@ -10,7 +13,7 @@ RUN \
apk add libevent-dev && \
mkdir build && \
cd build && \
git clone https://github.com/NLnetLabs/unbound.git && \
git clone --branch ${UNBOUND_TAG} ${UNBOUND_CLONE_URL} && \
cd unbound && \
./configure --with-libnghttp2 --with-libevent --prefix /opt/unbound --sysconfdir /etc && \
make && \

1
UPSTREAM_RELEASE_TAG Normal file
View File

@ -0,0 +1 @@
release-1.13.2

1
VERSION Normal file
View File

@ -0,0 +1 @@
1.0.1

View File

@ -35,24 +35,5 @@ server:
access-control: 10.200.200.0/24 allow
access-control: 172.17.0.0/16 allow
local-zone: "nober.de." transparent
local-data: "base.hv.nober.de. IN A 172.16.10.41"
local-data: "api.hv.nober.de. IN A 172.16.10.41"
local-zone: "hottis.de." transparent
local-data: "authservice.hottis.de. IN A 172.16.10.41"
local-data: "bitwarden.hottis.de. IN A 172.16.10.41"
local-data: "smarthome.hottis.de. IN A 172.16.10.41"
local-data: "registry.hottis.de. IN A 172.16.10.41"
local-data: "home.hottis.de. IN A 172.16.10.41"
local-data: "sink.hottis.de. IN A 172.16.10.42"
local-data: "brkrint.hottis.de. IN A 172.16.2.16"
local-data: "vpnhead.hottis.de. IN A 172.16.12.10"
local-data: "syslog.hottis.de. IN A 172.16.11.15"
local-zone: "mainscnt.eu." transparent
local-data: "grafana.mainscnt.eu. IN A 172.16.10.41"
local-data: "wiki.mainscnt.eu. IN A 172.16.10.41"
local-data: "broker.mainscnt.eu. IN A 172.16.10.40"
local-data: "db.mainscnt.eu. IN A 172.16.10.27"