From eb652a105b5fc2cc119ae83b26bef20b72882462 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Thu, 30 May 2024 10:55:53 +0300 Subject: [PATCH] docker proxy added --- .gitlab-ci.yml | 5 +++-- clr_test/clearing-all/Dockerfile | 2 +- clr_test/docker-compose.yml | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32864401b..218078000 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,12 @@ image: - name: docker:latest + name: ${DOCKER_PROXY}/docker:latest pull_policy: if-not-present variables: GIT_SUBMODULE_STRATEGY: recursive MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" MAVEN_CLI_OPTS: "-s /settings.xml -P nbki --batch-mode" + DOCKER_PROXY: "mirror.gcr.io" stages: - build @@ -18,7 +19,7 @@ cache: - z-distr/target/clearing/ build: - image: maven:latest + image: ${DOCKER_PROXY}/maven:latest stage: build script: - mvn clean package -DskipTests -Pdistributive diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile index cc7253cb6..e263597da 100644 --- a/clr_test/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-slim +FROM mirror.gcr.io/openjdk:17-slim ENV CLEARING_HOME="/opt/clearing" ENV CLEARING_HOME_BIN="/opt/clearing/bin" diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml index 21befdb43..67ddeabfa 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: db: - image: postgres:14.1-alpine + image: mirror.gcr.io/postgres:14.1-alpine restart: always environment: - POSTGRES_USER=clearing @@ -42,7 +42,7 @@ services: # restart: always zookeeper: - image: confluentinc/cp-zookeeper:6.2.3.amd64 + image: mirror.gcr.io/confluentinc/cp-zookeeper:6.2.3.amd64 container_name: zookeeper networks: - clearing-net @@ -54,7 +54,7 @@ services: - "22181:2181" kafka: - image: confluentinc/cp-kafka:6.2.3.amd64 + image: mirror.gcr.io/confluentinc/cp-kafka:6.2.3.amd64 container_name: kafka networks: - clearing-net @@ -73,7 +73,7 @@ services: - zookeeper sftp: - image: atmoz/sftp + image: mirror.gcr.io/atmoz/sftp networks: - clearing-net volumes: