Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change registry from docker to bh.cr #61

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG OS_VERSION
ARG DEVICE_TYPE=%%BALENA_MACHINE_NAME%%

FROM resin/resinos:${OS_VERSION}-${DEVICE_TYPE}
FROM bh.cr/balena_os/${DEVICE_TYPE}:${OS_VERSION}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bh.cr URLS have a / between the app and the version, not a :


COPY ./entry.sh /entry.sh
COPY ./conf/systemd-watchdog.conf /etc/systemd/system.conf.d/watchdog.conf
Expand All @@ -17,4 +17,4 @@ VOLUME /mnt/boot \
CMD [ "/entry.sh" ]

# avoid display crash on some host systems
RUN rm /lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
RUN rm /lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you tidy this commit by restoring the empty lines at the end of these files?

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
context: .
dockerfile: Dockerfile.template
args:
OS_VERSION: ${OS_VERSION:-2.95.12_rev1}
OS_VERSION: ${OS_VERSION:-3.2.4}
DEVICE_TYPE: ${DEVICE_TYPE:-genericx86-64-ext}
privileged: true
stop_signal: SIGRTMIN+3
Expand All @@ -33,4 +33,4 @@ services:
volumes:
boot:
data:
state:
state: