Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

control-service: use latest docker image #1538

Merged
merged 6 commits into from
Jan 23, 2023
+25 −44
Merged

control-service: use latest docker image #1538

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5418dd
control-service: use latest docker image
murphp15 Jan 23, 2023
98b0cfe
control-service: use latest docker image
murphp15 Jan 23, 2023
1b3932b
Merge branch 'main' into person/murphp15/use_latest_docker_image
murphp15 Jan 23, 2023
8b24ffc
control-service: use latest docker image
murphp15 Jan 23, 2023
5c05968
control-service: use latest docker image
murphp15 Jan 23, 2023
7a65071
Merge branch 'main' into person/murphp15/use_latest_docker_image
murphp15 Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions projects/control-service/cicd/.gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@
- projects/control-service/projects/helm_charts/pipelines-control-service/**/*

.control_service_base_build:
image: docker:19.03.15
image: docker:20.10.22
variables:
_JAVA_OPTIONS: "-Xms2048m -Xmx4096m"
before_script:
- apk --no-cache add git zip openjdk11-jdk curl zip python3 py3-pip --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
- pip3 install --upgrade pip && pip3 install awscli
- apk --no-cache add openjdk11-jdk git zip curl zip py-pip
- pip install --upgrade pip && pip install awscli

control_service_build_image:
extends: .control_service_base_build
services:
- docker:19.03.15-dind
- docker:20.10.22-dind
variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
stage: build
script:
- apk --no-cache add git openjdk11-jdk --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
- apk --no-cache add git openjdk11-jdk
- export TAG=$(git rev-parse --short HEAD)
- cd projects/control-service/projects
- ./gradlew -p ./model build publishToMavenLocal --info --stacktrace
Expand Down Expand Up @@ -118,9 +118,9 @@ control_service_test_helm_chart:
- projects/control-service/projects/helm_charts/pipelines-control-service/version.txt

control_service_publish_job_base_image:
image: docker:19.03.15
image: docker:20.10.22
services:
- docker:19.03.15-dind
- docker:20.10.22-dind
variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
Expand All @@ -145,9 +145,9 @@ control_service_publish_job_base_image:


control_service_publish_job_builder_image:
image: docker:19.03.15
image: docker:20.10.22
services:
- docker:19.03.15-dind
- docker:20.10.22-dind
variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
Expand Down Expand Up @@ -182,9 +182,9 @@ control_service_publish_job_builder_secure_image:


control_service_publish_image:
image: docker:19.03.15
image: docker:20.10.22
services:
- docker:19.03.15-dind
- docker:20.10.22-dind
variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
Expand Down Expand Up @@ -213,7 +213,7 @@ control_service_publish_image:
changes: *control_service_helm_change_locations

control_service_publish_api_client:
image: docker:19.03.15
image: docker:20.10.22
stage: publish_artifacts
script:
- apk add --no-cache py-pip openjdk11-jdk git python
Expand All @@ -240,8 +240,8 @@ control_service_deploy_testing_data_pipelines:
stage: pre_release
image: proum/aws-iam-authenticator
script:
- apk --no-cache add bash openssl curl git gettext zip python3 py3-pip
- pip3 install --upgrade pip && pip3 install awscli
- apk --no-cache add bash openssl curl git gettext zip py-pip
- pip install --upgrade pip && pip install awscli
- export DESIRED_VERSION=v3.6.3 # helm version 3.6.3
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
- bash -ex ./projects/control-service/cicd/deploy-testing-pipelines-service.sh
Expand Down Expand Up @@ -278,7 +278,7 @@ control_service_post_deployment_test:
changes: *control_service_helm_change_locations

control_service_release:
image: docker:19.03.15
image: docker:20.10.22
stage: release
script:
- apk --no-cache add bash openssl curl git
Expand All @@ -300,9 +300,9 @@ control_service_release:

# TODO: automatically rebuild image on vdk-heartbeat change
control_service_vdk_heartbeat_release:
image: docker:19.03.15
image: docker:20.10.22
services:
- docker:19.03.15-dind
- docker:20.10.22-dind
variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
Expand Down