From aaff97d878c54a7d866b57636083a418fe310106 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Mon, 4 Mar 2024 12:42:27 -0500 Subject: [PATCH] Use opensuse tumbleweed (#3282) --- .github/workflows/tests.yaml | 5 ++--- docker-compose.yml | 4 ++-- test/docker/{opensuse15 => opensuse} | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) rename test/docker/{opensuse15 => opensuse} (87%) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 8e955186c..cd3f64d83 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -81,10 +81,9 @@ jobs: - name: "Ubuntu 22.04" runner: ubuntu-latest dockerfile: ubuntu2204 - # This is actually "OpenSUSE Tumbleweed (Rolling)" but GitHub requires the "OpenSUSE 15" check, so keep that name - - name: "OpenSUSE 15" + - name: "OpenSUSE Tumbleweed (Rolling)" runner: ubuntu-latest - dockerfile: opensuse15 + dockerfile: opensuse - name: "Archlinux Base (Rolling)" runner: ubuntu-latest dockerfile: arch diff --git a/docker-compose.yml b/docker-compose.yml index 3042ff4f8..836e638fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,10 +40,10 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-opensuse15: + test-opensuse: build: context: . - dockerfile: test/docker/opensuse15 + dockerfile: test/docker/opensuse network_mode: "host" security_opt: - label=type:container_runtime_t diff --git a/test/docker/opensuse15 b/test/docker/opensuse similarity index 87% rename from test/docker/opensuse15 rename to test/docker/opensuse index 68274f86c..94a2d5a3a 100644 --- a/test/docker/opensuse15 +++ b/test/docker/opensuse @@ -1,8 +1,5 @@ FROM opensuse/tumbleweed -# NOTE: this isn't opensuse15 anymore, but this allows PRs to be merged by -# matching the GitHub configuration. - RUN zypper install -y python3 awk coreutils git gcc gcc-c++ cmake make libuuid-devel libfaketime curl # Setup language environment