Merge pull request os-autoinst#5819 from os-autoinst/containers_3

Switch codespaces devcontainer to single-instance-codespaces
r-richardson · Aug 5, 2024 · 0b3a25e · 0b3a25e
2 parents e214e26 + 8989228
commit 0b3a25e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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": {

diff --git 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