From c565edf0f6d6f90f66a54f27d28941b93ab57c59 Mon Sep 17 00:00:00 2001 From: SoMuchForSubtlety Date: Wed, 31 May 2023 21:25:02 +0200 Subject: [PATCH] Simplify config The unqualified registries setting is no longer needed, see https://github.com/containers/podman/pull/12435 --- .github/workflows/ci-rootless-podman.yml | 12 +++++------- build.gradle | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-rootless-podman.yml b/.github/workflows/ci-rootless-podman.yml index 87ae296aef5..4d270cbfbc7 100644 --- 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 index bea8d2616df..02b7e6f7270 100644 --- 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'