Merge main into dependabot/gradle/projects/control-service/projects/p…

…ipelines_control_service/io.swagger.core.v3-swagger-annotations-2.2.9
vmware · Mar 31, 2023 · 079faee · 079faee
2 parents 70c9f40 + a135bb6
commit 079faee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml
@@ -122,12 +122,7 @@ 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
-  variables:
-    DOCKER_HOST: tcp://localhost:2375
-    DOCKER_DRIVER: overlay2
-  services:
-    - docker:19.03.15-dind
+  extends: .images:dind
   stage: publish_artifacts
   script:
     - apk add --no-cache bash
@@ -144,12 +139,7 @@ control_service_publish_job_base_image:
         - projects/control-service/projects/job-base-image/**/*
 
 control_service_publish_job_base_image-secure:
-  image: docker:19.03.15
-  variables:
-    DOCKER_HOST: tcp://localhost:2375
-    DOCKER_DRIVER: overlay2
-  services:
-    - docker:19.03.15-dind
+  extends: .images:dind
   stage: publish_artifacts
   script:
     - apk add --no-cache bash
@@ -173,12 +163,7 @@ control_service_publish_job_base_image-secure:
         - projects/control-service/projects/job-base-image-secure/**/*
 
 control_service_publish_job_builder_image:
-  image: docker:19.03.15
-  variables:
-    DOCKER_HOST: tcp://localhost:2375
-    DOCKER_DRIVER: overlay2
-  services:
-    - docker:19.03.15-dind
+  extends: .images:dind
   stage: publish_artifacts
   script:
     - apk add --no-cache bash

diff --git a/projects/control-service/projects/job-builder-secure/Dockerfile b/projects/control-service/projects/job-builder-secure/Dockerfile
@@ -24,7 +24,7 @@ RUN apk add --no-cache --update \
     git \
     bash
 
-RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/main python3=3.10.9-r1 py3-pip \
+RUN apk add --update --no-cache python3=3.10.10-r0 py3-pip \
     && pip3 install awscli  \
     && apk --purge -v del py3-pip \
     && rm -rf /var/cache/apk/*

diff --git a/projects/control-service/projects/job-builder/Dockerfile b/projects/control-service/projects/job-builder/Dockerfile
@@ -24,7 +24,7 @@ RUN apk add --no-cache --update \
     git \
     bash
 
-RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/main python3=3.7.10-r0 py3-pip \
+RUN apk add --no-cache python3=3.10.10-r0 py3-pip \
     && pip3 install awscli  \
     && apk --purge -v del py3-pip \
     && rm -rf /var/cache/apk/*