Simplify config

The unqualified registries setting is no longer needed, see containers/podman#12435
testcontainers · Jul 29, 2023 · ca94c0b · ca94c0b
1 parent 5b27edb
commit ca94c0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci-rootless-podman.yml b/.github/workflows/ci-rootless-podman.yml
@@ -2,7 +2,7 @@ name: CI-Podman-Rootless
 
 on:
   pull_request: {}
-  push: { branches: [ main ] }
+  push: { branches: [main] }
 
 permissions:
   contents: read
@@ -18,12 +18,10 @@ jobs:
       - name: Configure podman
         run: |
           mkdir -p $HOME/.config/containers
-          echo 'unqualified-search-registries = ["docker.io"]' > $HOME/.config/containers/registries.conf
-          echo ''                                             >> $HOME/.config/containers/registries.conf
-          echo '[[registry]]'                                 >> $HOME/.config/containers/registries.conf
-          echo 'prefix = "localhost"'                         >> $HOME/.config/containers/registries.conf
-          echo 'location = "localhost"'                       >> $HOME/.config/containers/registries.conf
-          echo 'insecure = true'                              >> $HOME/.config/containers/registries.conf
+          echo '[[registry]]'            > $HOME/.config/containers/registries.conf
+          echo 'prefix = "localhost"'   >> $HOME/.config/containers/registries.conf
+          echo 'location = "localhost"' >> $HOME/.config/containers/registries.conf
+          echo 'insecure = true'        >> $HOME/.config/containers/registries.conf
       - name: Install latest podman release
         # see https://podman.io/getting-started/installation#ubuntu
         run: |

diff --git a/build.gradle b/build.gradle
@@ -97,7 +97,7 @@ subprojects {
 
         if (System.properties['test.profile'] == 'podman') {
             // The compose container relies on the deprecated link feature, which is not supported by podman
-            exclude '**/*DockerCompose*'
+            exclude '**/*Compose*'
             filter {
                 // cgroups v2 don't support settings swappiness
                 excludeTestsMatching '*shouldReportOOMAfterWait'