Skip to content

Commit

Permalink
Default to balenaOS generic-amd64 v5.1.50
Browse files Browse the repository at this point in the history
5.3.11 is also supported on generic-aarch64

Change-type: minor
Signed-off-by: Kyle Harding <kyle@balena.io>
  • Loading branch information
klutchell committed May 31, 2024
1 parent 29d58cd commit 4693936
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.json
.env
3 changes: 2 additions & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
ARG OS_VERSION
ARG DEVICE_TYPE=%%BALENA_MACHINE_NAME%%

FROM resin/resinos:${OS_VERSION}-${DEVICE_TYPE}
# hadolint ignore=DL3007
FROM bh.cr/balena_os/${DEVICE_TYPE}/${OS_VERSION}:latest

COPY ./entry.sh /entry.sh
COPY ./conf/systemd-watchdog.conf /etc/systemd/system.conf.d/watchdog.conf
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ services:
context: .
dockerfile: Dockerfile.template
args:
OS_VERSION: ${OS_VERSION:-2.95.12_rev1}
DEVICE_TYPE: ${DEVICE_TYPE:-genericx86-64-ext}
OS_VERSION: ${OS_VERSION:-5.1.50}
DEVICE_TYPE: ${DEVICE_TYPE:-generic-amd64}
privileged: true
stop_signal: SIGRTMIN+3
stop_grace_period: 30s
volumes:
- /lib/modules:/lib/modules:ro
- ${CONFIG_JSON:-./config.json}:/var/local/config.json
- ${CONFIG_JSON:-./config.json}:/var/local/config.json:ro
- boot:/mnt/boot
- data:/mnt/data
- state:/mnt/state
Expand Down

0 comments on commit 4693936

Please sign in to comment.