diff --git a/.gitea/workflows/kub-deploy.yml b/.gitea/workflows/kub-deploy.yml index a565c7a..74f3483 100644 --- a/.gitea/workflows/kub-deploy.yml +++ b/.gitea/workflows/kub-deploy.yml @@ -8,9 +8,6 @@ on: env: REGISTRY: 194.5.195.53:30080 IMAGE_NAME: admin/cms - HTTP_PROXY: http://proxyuser:87zH26nbqT@46.249.98.211:3128 - HTTPS_PROXY: http://proxyuser:87zH26nbqT@46.249.98.211:3128 - NO_PROXY: localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8 jobs: build-and-deploy: @@ -18,6 +15,10 @@ jobs: container: image: docker:latest options: --privileged + env: + HTTP_PROXY: http://proxyuser:87zH26nbqT@46.249.98.211:3128 + HTTPS_PROXY: http://proxyuser:87zH26nbqT@46.249.98.211:3128 + NO_PROXY: localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8 steps: - name: Install git run: apk add --no-cache git @@ -25,21 +26,21 @@ jobs: - name: Clone repo run: | git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/CMS.git . - ls -la - - name: Start Docker daemon + - name: Start Docker daemon with proxy run: | - # Configure Docker daemon with proxy - mkdir -p /etc/docker - cat > /etc/docker/daemon.json << DAEMON + mkdir -p ~/.docker + cat > ~/.docker/config.json << CONF { "proxies": { - "http-proxy": "$HTTP_PROXY", - "https-proxy": "$HTTPS_PROXY", - "no-proxy": "$NO_PROXY" + "default": { + "httpProxy": "http://proxyuser:87zH26nbqT@46.249.98.211:3128", + "httpsProxy": "http://proxyuser:87zH26nbqT@46.249.98.211:3128", + "noProxy": "localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8" + } } } - DAEMON + CONF dockerd & for i in $(seq 1 30); do docker info >/dev/null 2>&1 && break || sleep 2 @@ -49,7 +50,10 @@ jobs: - name: Build Docker Image run: | docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ - -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest . + -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \ + --build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT@46.249.98.211:3128 \ + --build-arg HTTPS_PROXY=http://proxyuser:87zH26nbqT@46.249.98.211:3128 \ + . - name: Push to Registry run: |