fix: configの順序ミス

UniPro-tech · Aug 1, 2024 · bd5650c · bd5650c
1 parent 3ed0fbd
commit bd5650c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 44 deletions.
diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -14,28 +14,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Enable 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: Check Docker status
-        run: |
-          export DOCKER_CLIENT_TIMEOUT=18000
-          export COMPOSE_HTTP_TIMEOUT=240
-          sudo systemctl status docker.service
-          sudo journalctl -xeu docker.service
-
       - name: Build Docker image
         run: docker build -t ${{ secrets.K8S_DOCKER_REGISTHOST }}/mediawiki:latest .
         id: build
@@ -65,5 +43,20 @@ 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
@@ -18,28 +18,6 @@ jobs:
         run: |
           tagname=${GITHUB_REF#refs/*/} && echo "TAG_NAME=${tagname#v}" >> $GITHUB_ENV
 
-      - name: Enable 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: Check Docker status
-        run: |
-          export DOCKER_CLIENT_TIMEOUT=18000
-          export COMPOSE_HTTP_TIMEOUT=240
-          sudo systemctl status docker.service
-          sudo journalctl -xeu docker.service
-
       - name: Build Docker image
         run: docker build -t ${{ secrets.K8S_DOCKER_REGISTHOST }}/mediawiki:${{ env.TAG_NAME }} .
         id: build
@@ -69,5 +47,20 @@ 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:${{ env.TAG_NAME }}