From 0857a248b644d373b4d6dcb7584c879c30ada9df Mon Sep 17 00:00:00 2001
From: Jan Baier <jbaier@suse.cz>
Date: Mon, 5 Aug 2024 14:39:28 +0200
Subject: [PATCH 1/2] Revert "Downgrade single-instance-container to Leap"

This reverts commit 531e7bec3059d90ef37640d67ec2ba6b52fa09dd.
---
 container/single-instance/Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/container/single-instance/Dockerfile b/container/single-instance/Dockerfile
index 716c25293d5..d7576e49c86 100644
--- a/container/single-instance/Dockerfile
+++ b/container/single-instance/Dockerfile
@@ -2,7 +2,7 @@
 #!BuildTag: openqa-single-instance:latest opensuse/openqa-single-instance:latest opensuse/openqa-single-instance:%PKG_VERSION% opensuse/openqa-single-instance:%PKG_VERSION%.%RELEASE%
 
 # hadolint ignore=DL3006
-FROM opensuse/leap:15.5
+FROM opensuse/tumbleweed
 
 # labelprefix=org.opensuse.openqa-single-instance
 LABEL org.opencontainers.image.title="openQA single-instance container"
@@ -15,9 +15,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 
 # installing more of packages that are selected in openqa-bootstrap.  Combining here saves installation time
 # hadolint ignore=DL3037
-RUN zypper ar -f -p 95 http://download.opensuse.org/repositories/devel:openQA/15.5 devel_openQA && \
-    zypper --gpg-auto-import-keys ref && \
-    zypper in -y openQA-single-instance openQA-bootstrap \
+RUN zypper in -y openQA-single-instance openQA-bootstrap \
     qemu-arm qemu-ppc qemu-x86 qemu-tools sudo iputils os-autoinst-distri-opensuse-deps && \
     zypper clean -a
 EXPOSE 80 443 9526

From 89892287c723d5f48591de02c60567c6f07f1714 Mon Sep 17 00:00:00 2001
From: Jan Baier <jbaier@suse.cz>
Date: Mon, 5 Aug 2024 14:52:30 +0200
Subject: [PATCH 2/2] Switch codespaces devcontainer to
 single-instance-codespaces

Reference: https://progress.opensuse.org/issues/161399
---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index adbe52a3dcc..456192feb5c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "openQA Single Instance",
-    "image": "registry.opensuse.org/devel/openqa/containers15.5/openqa-single-instance",
+    "image": "registry.opensuse.org/devel/openqa/containers/openqa-single-instance-codespaces",
     "runArgs": [ "--privileged", "--device", "/dev/kvm", "--entrypoint", "bash" ],
     "postCreateCommand": "chown root:kvm /dev/kvm",
     "containerEnv": {