From 2d009b635d3e7a9c730cedcc27d572cdfac6d9f7 Mon Sep 17 00:00:00 2001 From: YuitoAkatsuki Date: Wed, 23 Oct 2024 21:58:17 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20insecure=E3=81=AA=E3=81=97=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-push.yaml | 15 --------------- .github/workflows/docker-tag.yaml | 14 -------------- 2 files changed, 29 deletions(-) diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml index 33708ec..b51a930 100644 --- a/.github/workflows/docker-push.yaml +++ b/.github/workflows/docker-push.yaml @@ -43,20 +43,5 @@ jobs: - name: Load Docker image from file run: docker load -i mediawiki_latest.tar - - name: Set Docker configuration - run: | - SW_JSON="" - SW_JSON="$(sudo cat /etc/docker/daemon.json | jq '.+{ "insecure-registries":["${{ secrets.K8S_DOCKER_REGISTHOST }}"],"max-concurrent-uploads": 1,"debug":true }')" - echo "${SW_JSON}" | sudo bash -c 'cat -- > /etc/docker/daemon.json' - sudo cat /etc/docker/daemon.json - sudo systemctl restart docker || sudo journalctl -xeu docker.service - echo --- - docker info - echo --- - docker image ls - echo --- - sudo systemctl status docker - shell: bash - - name: Push Docker image run: docker push ${{ secrets.K8S_DOCKER_REGISTHOST }}/mediawiki:latest diff --git a/.github/workflows/docker-tag.yaml b/.github/workflows/docker-tag.yaml index c35cdc3..273dba7 100644 --- a/.github/workflows/docker-tag.yaml +++ b/.github/workflows/docker-tag.yaml @@ -18,20 +18,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: enable - run: | - SW_JSON="" - SW_JSON="$(sudo cat /etc/docker/daemon.json | jq '.+{ "insecure-registries":["${{ secrets.K8S_DOCKER_REGISTHOST }}"] }')" - echo "${SW_JSON}" | sudo bash -c 'cat -- > /etc/docker/daemon.json' - sudo cat /etc/docker/daemon.json - sudo systemctl restart docker || sudo journalctl -xeu docker.service - echo --- - docker info - echo --- - docker image ls - echo --- - sudo systemctl status docker - - name: Insecure Setting run: | export DOCKER_CLIENT_TIMEOUT=120