switch to short name for native containers

epics-containers · Mar 8, 2024 · 7a9d541 · 7a9d541
1 parent e6cb7ac
commit 7a9d541
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,11 +5,11 @@
         "dockerfile": "../Dockerfile",
         "target": "developer",
         "args": {
-            "TARGET_ARCHITECTURE": "RTEMS-beatnik",
-            // "TARGET_ARCHITECTURE": "linux-x86_64",
+            //"TARGET_ARCHITECTURE": "RTEMS-beatnik",
+            "TARGET_ARCHITECTURE": "linux-x86_64",
             "EPICS_HOST_ARCH": "linux-x86_64",
-            "BASE_IMAGE": "ghcr.io/epics-containers/rtems6-powerpc-linux-runtime:6.2rc1ec2b2"
-            // "BASE_IMAGE": "ubuntu:22.04"
+            // "BASE_IMAGE": "ghcr.io/epics-containers/rtems6-powerpc-linux-runtime:6.2rc1ec2b2"
+            "BASE_IMAGE": "ubuntu:22.04"
         }
     },
     "remoteEnv": {

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,23 +16,26 @@ jobs:
       matrix:
         epics-target: [RTEMS-beatnik, linux-x86_64, linux-aarch64]
         target: [developer, runtime]
-        base_image: [ubuntu:22.04]
-        os: [ubuntu-latest]
+        base_image: ["ubuntu:22.04"]
         name: [epics-base]
+        os: [ubuntu-latest]
         include:
           - epics-target: RTEMS-beatnik
             epics-host: linux-x86_64
             name: epics-base-rtems-beatnik
             base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1rc2
             platform: linux/amd64
+            os: ubuntu-latest
 
           - epics-target: linux-x86_64
             epics-host: linux-x86_64
             platform: linux/amd64
+            os: ubuntu-latest
 
           - epics-target: linux-aarch64
             epics-host: linux-aarch64
             platform: linux/arm64
+            os: ubuntu-latest
 
     runs-on: ${{ matrix.os }}
     env: