Skip to content

Commit c0166ec

Browse files
Simplify config
The unqualified registries setting is no longer needed, see containers/podman#12435
1 parent fabe1bc commit c0166ec

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/ci-rootless-podman.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI-Podman-Rootless
22

33
on:
44
pull_request: {}
5-
push: { branches: [ main ] }
5+
push: { branches: [main] }
66

77
permissions:
88
contents: read
@@ -18,12 +18,10 @@ jobs:
1818
- name: Configure podman
1919
run: |
2020
mkdir -p $HOME/.config/containers
21-
echo 'unqualified-search-registries = ["docker.io"]' > $HOME/.config/containers/registries.conf
22-
echo '' >> $HOME/.config/containers/registries.conf
23-
echo '[[registry]]' >> $HOME/.config/containers/registries.conf
24-
echo 'prefix = "localhost"' >> $HOME/.config/containers/registries.conf
25-
echo 'location = "localhost"' >> $HOME/.config/containers/registries.conf
26-
echo 'insecure = true' >> $HOME/.config/containers/registries.conf
21+
echo '[[registry]]' > $HOME/.config/containers/registries.conf
22+
echo 'prefix = "localhost"' >> $HOME/.config/containers/registries.conf
23+
echo 'location = "localhost"' >> $HOME/.config/containers/registries.conf
24+
echo 'insecure = true' >> $HOME/.config/containers/registries.conf
2725
- name: Install latest podman release
2826
# see https://podman.io/getting-started/installation#ubuntu
2927
run: |

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ subprojects {
9797

9898
if (System.properties['test.profile'] == 'podman') {
9999
// The compose container relies on the deprecated link feature, which is not supported by podman
100-
exclude '**/*DockerCompose*'
100+
exclude '**/*Compose*'
101101
filter {
102102
// cgroups v2 don't support settings swappiness
103103
excludeTestsMatching '*shouldReportOOMAfterWait'

0 commit comments

Comments
 (0)