From adc5bfd50f085ece2378dc93e63e9e78ada669cd Mon Sep 17 00:00:00 2001 From: Marc Hanheide Date: Sat, 25 Jan 2025 10:16:20 +0000 Subject: [PATCH 1/2] use new limo base image --- .github/workflows/container-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index beea997..e3b5879 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: include: - - base_image: lcas.lincoln.ac.uk/lcas/limo_platform:1 + - base_image: lcas.lincoln.ac.uk/lcas/limo_platform:2 push_image: lcas.lincoln.ac.uk/devcontainer/ros2-teaching steps: From b6bba68b8dfff15bd2a22001946f642af16dfe81 Mon Sep 17 00:00:00 2001 From: Marc Hanheide Date: Sat, 25 Jan 2025 10:37:14 +0000 Subject: [PATCH 2/2] change base image in dev container and multiplatform support --- .devcontainer/devcontainer.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6ad3a68..bd0216c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,11 +8,8 @@ "build": { "dockerfile": "./Dockerfile", "args": { - // set the base image, add `-arm64` as a suffix if you have an ARM (e.g. Apple Mx) CPU: - "BASE_IMAGE": "lcas.lincoln.ac.uk/lcas/limo_platform_amd64:1" + "BASE_IMAGE": "lcas.lincoln.ac.uk/lcas/limo_platform:2" }, - // change this to linux/arm64 if you have an ARM (e.g. Apple Mx) CPU: - "platform": "linux/amd64", "context": ".." }, @@ -50,4 +47,4 @@ "cpus": 2, "memory": "6gb" } -} \ No newline at end of file +}