Skip to content

Commit f5f9a5e

Browse files
committedFeb 9, 2025·
update & upgrade
1 parent 14e1d00 commit f5f9a5e

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed
 

‎debian-armv6

+8-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LABEL maintainer="Hyperion Project <admin@hyperion-project.org>" \
2323
ARG DEBIAN_FRONTEND=noninteractive
2424

2525
# update
26-
RUN apt-get update
26+
RUN apt-get update && apt-get -y upgrade
2727

2828
# install qt5 or qt6 (qt6 is not available on debian buster/bullseye)
2929
RUN if [ "$SUITE" = "bookworm" ] && [ "$QT_VERSION" = "6" ]; then \
@@ -74,7 +74,13 @@ RUN mkdir -p /tmp/cmake; \
7474
RUN cmake --version
7575

7676
# download qemu and set exec flag
77-
RUN curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-arm.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-arm-static /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static
77+
RUN curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-arm.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-arm-static /usr/bin/qemu-static
78+
79+
# set qemu exec flag
80+
RUN chmod +x /usr/bin/qemu-static
81+
82+
# cleanup
83+
RUN apt-get clean -q -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
7884

7985
# set entrypoint
8086
ENTRYPOINT [ "/usr/bin/qemu-static" ]

‎ubuntu_debian

+11-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV DEBEMAIL="admin@hyperion-project.org"
2929
ARG DEBIAN_FRONTEND=noninteractive
3030

3131
# update
32-
RUN apt-get update
32+
RUN apt-get update && apt-get -y upgrade
3333

3434
# install qt5 or qt6 (qt6 is not available on ubuntu focal and debian buster)
3535
# on debian bullseye add backports to install qt6
@@ -112,14 +112,20 @@ fi
112112
# Show cmake version
113113
RUN cmake --version
114114

115-
# download qemu and set exec flag
115+
# download qemu
116116
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
117-
curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-aarch64.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-aarch64-static /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static; \
117+
curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-aarch64.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-aarch64-static /usr/bin/qemu-static; \
118118
elif [ "$TARGETPLATFORM" = "linux/arm/v6" ] || [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
119-
curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-arm.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-arm-static /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static; \
119+
curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-arm.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-arm-static /usr/bin/qemu-static; \
120120
else \
121-
printf '#!/bin/bash\nexec "$@"' > /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static; \
121+
printf '#!/bin/bash\nexec "$@"' > /usr/bin/qemu-static; \
122122
fi
123123

124+
# set qemu exec flag
125+
RUN chmod +x /usr/bin/qemu-static
126+
127+
# cleanup
128+
RUN apt-get clean -q -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
129+
124130
# set entrypoint
125131
ENTRYPOINT [ "/usr/bin/qemu-static" ]

0 commit comments

Comments
 (0)
Please sign in to comment.