Merge pull request puppetlabs#3303 from donoghuc/docker-compose-fix

(maint) Stop installing docker-compose
h0tw1r3 · Apr 16, 2024 · fe314a7 · fe314a7
2 parents b0b7725 + 2023632
commit fe314a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/actions/docker_setup/action.yaml b/.github/actions/docker_setup/action.yaml
@@ -6,6 +6,5 @@ runs:
     - name: Bring up containers
       shell: bash
       run: |
-        sudo apt install docker-compose
-        docker-compose -f spec/docker-compose.yml build --parallel
-        docker-compose -f spec/docker-compose.yml up -d
+        docker compose -f spec/docker-compose.yml build --parallel
+        docker compose -f spec/docker-compose.yml up -d
diff --git a/.github/actions/sudo_setup/action.yaml b/.github/actions/sudo_setup/action.yaml
@@ -6,9 +6,8 @@ runs:
     - name: Bring up containers
       shell: bash
       run: |
-        sudo apt install docker-compose
-        docker-compose -f spec/docker-compose.yml build --parallel
-        docker-compose -f spec/docker-compose.yml up -d
+        docker compose -f spec/docker-compose.yml build --parallel
+        docker compose -f spec/docker-compose.yml up -d
     - name: Create non-sudo user
       shell: bash
       run: |