From c8b79ac369bf67d987ba7b10614f62626547995f Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 26 Sep 2020 12:05:06 +0200 Subject: [PATCH] use common build and publish approach --- .gitlab-ci.yml | 29 ++++------------------------- readme.md | 1 - 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43ca3f0..9e5f3a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,4 @@ -image: wollud1969/docker-bash:latest - -stages: - - build - -variables: - IMAGE_NAME: registry.hottis.de/dockerized/base-build-env - HUB_IMAGE_NAME: wollud1969/base-build-env - -build: - stage: build - tags: - - hottis - - linux - - docker - script: - - VERSION=`cat VERSION` - - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest . - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker push $IMAGE_NAME:latest - - docker push $IMAGE_NAME:$VERSION - - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD - - docker push $HUB_IMAGE_NAME:latest - - docker push $HUB_IMAGE_NAME:$VERSION - +include: + - project: dockerized/commons + ref: master + file: gitlab-ci-template.yml diff --git a/readme.md b/readme.md index b126d99..0514350 100644 --- a/readme.md +++ b/readme.md @@ -12,6 +12,5 @@ Contains additionally: * wget and curl * zip, unzip and 7z * vim.tiny - * texlive * GitLab release tool: https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader including validator for semantic version according to https://semver.org/