From e9b92fb712f33a59dd20a54dd855ed67b0945f9a Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 26 Sep 2020 12:17:55 +0200 Subject: [PATCH] use common build and publish approach --- .gitlab-ci.yml | 29 ++++------------------------- Dockerfile | 2 +- VERSION | 1 - 3 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 VERSION diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dad8e8b..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/build-env-latex - HUB_IMAGE_NAME: wollud1969/build-env-latex - -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/Dockerfile b/Dockerfile index 73529d5..c268612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.hottis.de/dockerized/base-build-env:0.3.0 +FROM registry.hottis.de/dockerized/base-build-env:1.0.0 LABEL Maintainer="Wolfgang Hottgenroth " LABEL ImageName="registry.hottis.de/dockerized/build-env-latex" diff --git a/VERSION b/VERSION deleted file mode 100644 index 6e8bf73..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1.0