timeoutの設定の変更

UniPro-tech · Jul 31, 2024 · 2347df5 · 2347df5
1 parent fb9fefd
commit 2347df5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -19,6 +19,8 @@ jobs:
           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'
+          SW_JSON="$(sudo cat /etc/docker/daemon.json | jq '.+{ "experimental":false }')"
+          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 ---
@@ -28,12 +30,6 @@ jobs:
           echo ---
           sudo systemctl status docker
         shell: bash
-      - name: Check Docker status
-        run: |
-          export DOCKER_CLIENT_TIMEOUT=9000
-          export COMPOSE_HTTP_TIMEOUT=120
-          sudo systemctl status docker.service
-          sudo journalctl -xeu docker.service
 
       - name: Build Docker image
         run: docker build -t ${{ secrets.K8S_DOCKER_REGISTHOST }}/mediawiki:latest .

diff --git a/.github/workflows/docker-tag.yaml b/.github/workflows/docker-tag.yaml
@@ -22,6 +22,9 @@ jobs:
         run: |
           SW_JSON=""
           SW_JSON="$(sudo cat /etc/docker/daemon.json | jq '.+{ "insecure-registries":["${{ secrets.K8S_DOCKER_REGISTHOST }}"] }')"
+          "experimental": false
+          echo "${SW_JSON}" | sudo bash -c 'cat -- > /etc/docker/daemon.json'
+          SW_JSON="$(sudo cat /etc/docker/daemon.json | jq '.+{ "experimental":false }')"
           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
@@ -32,13 +35,6 @@ jobs:
           echo ---
           sudo systemctl status docker
 
-      - name: Insecure Setting
-        run: |
-          export DOCKER_CLIENT_TIMEOUT=9000
-          export COMPOSE_HTTP_TIMEOUT=120
-          sudo systemctl daemon-reload
-          sudo systemctl restart docker
-
       - name: Build Docker image
         run: docker build -t ${{ secrets.K8S_DOCKER_REGISTHOST }}/mediawiki:${{ env.TAG_NAME }} .