Make tox happier

sillsdev · Oct 24, 2024 · 1329012 · 1329012
1 parent 300605b
commit 1329012
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 32 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -185,10 +185,3 @@ jobs:
         run: |
           deploy/scripts/build.py --components backend --debug --arch ${{ matrix.arch }}
         shell: bash
-      - name: List images
-        run: |
-          docker images
-      - name: Image digest
-        run: |
-          docker --debug image inspect combine_backend:latest -f '{{json .Id}}'
-        shell: bash
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
@@ -41,10 +41,3 @@ jobs:
         run: |
           deploy/scripts/build.py --components database --debug --arch ${{ matrix.arch }}
         shell: bash
-      - name: List images
-        run: |
-          docker images
-      - name: Image digest
-        run: |
-          docker --debug image inspect combine_database:latest -f '{{json .Id}}'
-        shell: bash
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -141,10 +141,3 @@ jobs:
         run: |
           deploy/scripts/build.py --components frontend --debug --arch ${{ matrix.arch }}
         shell: bash
-      - name: List images
-        run: |
-          docker images
-      - name: Image digest
-        run: |
-          docker --debug image inspect combine_frontend:latest -f '{{json .Id}}'
-        shell: bash
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
@@ -43,10 +43,3 @@ jobs:
         run: |
           deploy/scripts/build.py --components maintenance --debug --arch ${{ matrix.arch }}
         shell: bash
-      - name: List images
-        run: |
-          docker images
-      - name: Image digest
-        run: |
-          docker --debug image inspect combine_maint:latest -f '{{json .Id}}'
-        shell: bash
diff --git a/deploy/scripts/build.py b/deploy/scripts/build.py
@@ -267,19 +267,20 @@ def main() -> None:
 
     # Setup required build engine - docker or nerdctl
     container_cmd = [os.getenv("CONTAINER_CLI", "docker")]
+    build_cmd = container_cmd
+    push_cmd = container_cmd
     match container_cmd[0]:
         case "nerdctl":
             if args.debug:
                 container_cmd.append("--debug-full")
-            build_cmd = container_cmd + ["-n", args.namespace, "build"]
-            push_cmd = container_cmd + ["-n", args.namespace, "push"]
+            build_cmd.extend(["-n", args.namespace, "build"])
+            push_cmd.extend(["-n", args.namespace, "push"])
         case "docker":
             if args.debug:
                 container_cmd.extend(["-D", "-l", "debug"])
-            build_cmd = container_cmd + ["buildx", "build"]
+            build_cmd.extend(["buildx", "build"])
             if args.repo is not None:
                 build_cmd.append("--push")
-            push_cmd: list[str] = []
         case _:
             logging.critical(f"Container CLI '{container_cmd[0]}' is not supported.")
             sys.exit(1)