Skip to content
Snippets Groups Projects
Commit 7c2acb21 authored by Sören Henning's avatar Sören Henning
Browse files

Merge branch 'container-build-without-docker' into 'master'

Container build without Docker

See merge request !207
parents 8bb6757c 535c1033
No related branches found
No related tags found
1 merge request!207Container build without Docker
Pipeline #5530 passed
...@@ -22,6 +22,20 @@ default: ...@@ -22,6 +22,20 @@ default:
variables: variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
.kaniko-push:
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script:
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"${CR_HOST}\":{\"auth\":\"$(printf "%s:%s" "${CR_USER}" "${CR_PW}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
- DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//')
- "[ ! $CI_COMMIT_TAG ] && KANIKO_D=\"$KANIKO_D -d $CR_HOST/$CR_ORG/$IMAGE_NAME:${DOCKER_TAG_NAME}latest\""
- "[ ! $CI_COMMIT_TAG ] && KANIKO_D=\"$KANIKO_D -d $CR_HOST/$CR_ORG/$IMAGE_NAME:$DOCKER_TAG_NAME$CI_COMMIT_SHORT_SHA\""
- "[ $CI_COMMIT_TAG ] && KANIKO_D=\"$KANIKO_D -d $CR_HOST/$CR_ORG/$IMAGE_NAME:$CI_COMMIT_TAG\""
- "[ $DOCKERFILE ] && KANIKO_DOCKERFILE=\"--dockerfile $DOCKERFILE\""
- /kaniko/executor --context `pwd`/$CONTEXT $KANIKO_DOCKERFILE $KANIKO_D
# Theodolite Helm Chart # Theodolite Helm Chart
...@@ -118,21 +132,16 @@ spotbugs-benchmarks: ...@@ -118,21 +132,16 @@ spotbugs-benchmarks:
stage: deploy stage: deploy
extends: extends:
- .benchmarks - .benchmarks
- .dind - .kaniko-push
needs: needs:
- build-benchmarks - build-benchmarks
- checkstyle-benchmarks - checkstyle-benchmarks
- pmd-benchmarks - pmd-benchmarks
- spotbugs-benchmarks - spotbugs-benchmarks
script: variables:
- DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') CONTEXT: "/$JAVA_PROJECT_NAME"
- docker build --pull -t $IMAGE_NAME ./$JAVA_PROJECT_NAME #before_script:
- "[ ! $CI_COMMIT_TAG ] && docker tag $IMAGE_NAME $CR_HOST/$CR_ORG/$IMAGE_NAME:${DOCKER_TAG_NAME}latest" # - cd theodolite-benchmarks/$JAVA_PROJECT_NAME
- "[ ! $CI_COMMIT_TAG ] && docker tag $IMAGE_NAME $CR_HOST/$CR_ORG/$IMAGE_NAME:$DOCKER_TAG_NAME$CI_COMMIT_SHORT_SHA"
- "[ $CI_COMMIT_TAG ] && docker tag $IMAGE_NAME $CR_HOST/$CR_ORG/$IMAGE_NAME:$CI_COMMIT_TAG"
- echo $CR_PW | docker login $CR_HOST -u $CR_USER --password-stdin
- docker push $CR_HOST/$CR_ORG/$IMAGE_NAME
- docker logout
rules: rules:
- changes: - changes:
- theodolite-benchmarks/* - theodolite-benchmarks/*
...@@ -289,21 +298,15 @@ deploy-theodolite: ...@@ -289,21 +298,15 @@ deploy-theodolite:
stage: deploy stage: deploy
extends: extends:
- .theodolite - .theodolite
- .dind - .kaniko-push
needs: needs:
#- build-theodolite-native #- build-theodolite-native
- build-theodolite-jvm - build-theodolite-jvm
- test-theodolite - test-theodolite
script: variables:
- DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') IMAGE_NAME: theodolite
#- docker build -f src/main/docker/Dockerfile.native -t theodolite . DOCKERFILE: src/main/docker/Dockerfile.jvm
- docker build -f src/main/docker/Dockerfile.jvm -t theodolite . #DOCKERFILE: src/main/docker/Dockerfile.native
- "[ ! $CI_COMMIT_TAG ] && docker tag theodolite $CR_HOST/$CR_ORG/theodolite:${DOCKER_TAG_NAME}latest"
- "[ ! $CI_COMMIT_TAG ] && docker tag theodolite $CR_HOST/$CR_ORG/theodolite:$DOCKER_TAG_NAME$CI_COMMIT_SHORT_SHA"
- "[ $CI_COMMIT_TAG ] && docker tag theodolite $CR_HOST/$CR_ORG/theodolite:$CI_COMMIT_TAG"
- echo $CR_PW | docker login $CR_HOST -u $CR_USER --password-stdin
- docker push $CR_HOST/$CR_ORG/theodolite
- docker logout
rules: rules:
- changes: - changes:
- theodolite/**/* - theodolite/**/*
...@@ -350,17 +353,13 @@ test-slo-checker-dropped-records-kstreams: ...@@ -350,17 +353,13 @@ test-slo-checker-dropped-records-kstreams:
deploy-slo-checker-lag-trend: deploy-slo-checker-lag-trend:
stage: deploy stage: deploy
extends: extends:
- .dind - .kaniko-push
needs: needs:
- test-slo-checker-lag-trend - test-slo-checker-lag-trend
script: before_script:
- DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') - cd slo-checker/record-lag
- docker build --pull -t theodolite-slo-checker-lag-trend slo-checker/record-lag variables:
- "[ ! $CI_COMMIT_TAG ] && docker tag theodolite-slo-checker-lag-trend $CR_HOST/$CR_ORG/theodolite-slo-checker-lag-trend:${DOCKER_TAG_NAME}latest" IMAGE_NAME: theodolite-slo-checker-lag-trend
- "[ $CI_COMMIT_TAG ] && docker tag theodolite-slo-checker-lag-trend $CR_HOST/$CR_ORG/theodolite-slo-checker-lag-trend:$CI_COMMIT_TAG"
- echo $CR_PW | docker login $CR_HOST -u $CR_USER --password-stdin
- docker push $CR_HOST/$CR_ORG/theodolite-slo-checker-lag-trend
- docker logout
rules: rules:
- changes: - changes:
- slo-checker/record-lag/**/* - slo-checker/record-lag/**/*
...@@ -372,17 +371,13 @@ deploy-slo-checker-lag-trend: ...@@ -372,17 +371,13 @@ deploy-slo-checker-lag-trend:
deploy-slo-checker-dropped-records-kstreams: deploy-slo-checker-dropped-records-kstreams:
stage: deploy stage: deploy
extends: extends:
- .dind - .kaniko-push
needs: needs:
- test-slo-checker-dropped-records-kstreams - test-slo-checker-dropped-records-kstreams
script: before_script:
- DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') - cd slo-checker/dropped-records
- docker build --pull -t theodolite-slo-checker-dropped-records-kstreams slo-checker/dropped-records variables:
- "[ ! $CI_COMMIT_TAG ] && docker tag theodolite-slo-checker-dropped-records-kstreams $CR_HOST/$CR_ORG/theodolite-slo-checker-dropped-records-kstreams:${DOCKER_TAG_NAME}latest" IMAGE_NAME: theodolite-slo-checker-dropped-records-kstreams
- "[ $CI_COMMIT_TAG ] && docker tag theodolite-slo-checker-dropped-records-kstreams $CR_HOST/$CR_ORG/theodolite-slo-checker-dropped-records-kstreams:$CI_COMMIT_TAG"
- echo $CR_PW | docker login $CR_HOST -u $CR_USER --password-stdin
- docker push $CR_HOST/$CR_ORG/theodolite-slo-checker-dropped-records-kstreams
- docker logout
rules: rules:
- changes: - changes:
- slo-checker/dropped-records/**/* - slo-checker/dropped-records/**/*
...@@ -397,16 +392,12 @@ deploy-slo-checker-dropped-records-kstreams: ...@@ -397,16 +392,12 @@ deploy-slo-checker-dropped-records-kstreams:
deploy-random-scheduler: deploy-random-scheduler:
stage: deploy stage: deploy
extends: extends:
- .dind - .kaniko-push
needs: [] needs: []
script: before_script:
- DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') - cd execution/infrastructure/random-scheduler
- docker build --pull -t theodolite-random-scheduler execution/infrastructure/random-scheduler variables:
- "[ ! $CI_COMMIT_TAG ] && docker tag theodolite-random-scheduler $CR_HOST/$CR_ORG/theodolite-random-scheduler:${DOCKER_TAG_NAME}latest" IMAGE_NAME: theodolite-random-scheduler
- "[ $CI_COMMIT_TAG ] && docker tag theodolite-random-scheduler $CR_HOST/$CR_ORG/theodolite-random-scheduler:$CI_COMMIT_TAG"
- echo $CR_PW | docker login $CR_HOST -u $CR_USER --password-stdin
- docker push $CR_HOST/$CR_ORG/theodolite-random-scheduler
- docker logout
rules: rules:
- changes: - changes:
- execution/infrastructure/random-scheduler/**/* - execution/infrastructure/random-scheduler/**/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment