Skip to content

Commit

Permalink
Merge pull request #41 from epics-containers/upgrade-to-ubuntu-24.04
Browse files Browse the repository at this point in the history
Bump version of ubuntu to 24.04
  • Loading branch information
gilesknap authored Jan 28, 2025
2 parents 85c93a7 + f45df66 commit 1b81bef
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"args": {
// Native target development settings ==============================
"EPICS_TARGET_ARCH": "linux-x86_64",
"BASE_IMAGE": "ubuntu:22.04"
"BASE_IMAGE": "ubuntu:24.04"
// Local cross compilation settings ================================
// "EPICS_TARGET_ARCH": "RTEMS-beatnik",
// "BASE_IMAGE": "ghcr.io/epics-containers/rtems-beatnik-runtime"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- epics-target: linux-x86_64
epics-host: linux-x86_64
name: epics-base
base_image: ubuntu:22.04
base_image: ubuntu:24.04
platform: linux/amd64

# cross compile for RTEMS to VME5500 (power pc beatnik)
Expand All @@ -36,7 +36,7 @@ jobs:
- epics-target: linux-aarch64
epics-host: linux-x86_64
name: epics-base-aarch64
base_image: ubuntu:22.04
base_image: ubuntu:24.04
platform: linux/amd64

runs-on: ${{ matrix.os }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# EPICS_HOST_ARCH: the epics host architecture name
# BASE_IMAGE: can be used to bring in cross compilation tools

ARG BASE_IMAGE=ubuntu:22.04
ARG RUNTIME_BASE=ubuntu:22.04
ARG BASE_IMAGE=ubuntu:24.04
ARG RUNTIME_BASE=ubuntu:24.04

##### developer stage ##########################################################
FROM ${BASE_IMAGE} AS developer
Expand Down
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TAG=${TAG:-ec_test}
if [ "$T_A" = "RTEMS-beatnik" ]; then
base="ghcr.io/epics-containers/rtems-beatnik-runtime"
else
base="ubuntu:22.04"
base="ubuntu:24.04"
fi

cd $(dirname ${0})
Expand Down

0 comments on commit 1b81bef

Please sign in to comment.