From 8afcfef5e8120d9109db6e3beff417b0d2f39d76 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 28 Sep 2023 18:39:47 +0200 Subject: [PATCH] remove cluster test stuff --- .gitlab-ci.yml | 45 ++++++++++++++------------------ .gitlab/agents/hottis/config.yml | 0 2 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 .gitlab/agents/hottis/config.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46a6d60..69e7c90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,29 +1,29 @@ stages: -# - build + - build - deploy variables: IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH HUB_IMAGE_NAME: wollud1969/sinkserver -#build: -# image: registry.hottis.de/dockerized/docker-bash:latest -# stage: build -# tags: -# - hottis -# - linux -# - docker -# script: -# - docker build --build-arg="VERSION=${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TAG}" --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} . -# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY; -# - docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} -# - if [ "$CI_COMMIT_TAG" != "" ]; then -# docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG}; -# docker push $IMAGE_NAME:${CI_COMMIT_TAG}; -# fi -# - 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 push ${HUB_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA} +build: + image: registry.hottis.de/dockerized/docker-bash:latest + stage: build + tags: + - hottis + - linux + - docker + script: + - docker build --build-arg="VERSION=${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TAG}" --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} . + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY; + - docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} + - if [ "$CI_COMMIT_TAG" != "" ]; then + docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG}; + docker push $IMAGE_NAME:${CI_COMMIT_TAG}; + fi + - 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 push ${HUB_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA} # deploy: @@ -52,11 +52,4 @@ variables: # environment: # name: production -deploy: - stage: deploy - image: - name: bitnami/kubectl:latest - entrypoint: [''] - script: - - kubectl config get-contexts diff --git a/.gitlab/agents/hottis/config.yml b/.gitlab/agents/hottis/config.yml deleted file mode 100644 index e69de29..0000000