Skip to content

Commit

Permalink
add generic installation to base image
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonroyaalmerol
sonroyaalmerol authored Feb 29, 2024
1 parent 6fa3522 commit 456db43
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 60 deletions.
41 changes: 11 additions & 30 deletions bookworm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,6 @@ RUN set -x \

############################################################

FROM arm64v8/debian:bookworm-slim as box_generic_build

ENV DEBIAN_FRONTEND noninteractive

# Set SHELL option explicitly
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# hadolint ignore=DL3008
RUN set -x \
&& dpkg --add-architecture armhf \
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
ca-certificates=20230311 \
wget=1.21.3-1+b1 \
gnupg=2.2.40-1.1 \
# Install, update & upgrade packages
&& wget --progress=dot:giga https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list \
&& (wget -qO- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg) \
&& wget --progress=dot:giga https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list \
&& (wget -qO- https://ryanfortner.github.io/box86-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg) \
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
box64-arm64 \
box86-generic-arm \
&& rm -rf /var/lib/apt/lists/*

############################################################

FROM arm64v8/python:slim-bookworm as box64_8k_build

ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -130,12 +102,11 @@ ENV DEBUGGER "/usr/local/bin/box86"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

COPY --from=qemu_build /usr/bin/qemu-i386-static /usr/bin/qemu-i386-static
COPY --from=box_generic_build /usr/local/bin/box86 /usr/local/bin/box86
COPY --from=box_generic_build /usr/local/bin/box64 /usr/local/bin/box64
COPY --from=box64_8k_build /tmp/install/usr/local/bin/box64 /usr/local/bin/box64-8k
COPY --from=box64_16k_build /tmp/install/usr/local/bin/box64 /usr/local/bin/box64-16k
COPY --from=box64_64k_build /tmp/install/usr/local/bin/box64 /usr/local/bin/box64-64k

# hadolint ignore=DL3008
RUN set -x \
# Install, update & upgrade packages
&& dpkg --add-architecture armhf \
Expand All @@ -149,6 +120,16 @@ RUN set -x \
nano=7.2-1 \
curl=7.88.1-10+deb12u5 \
locales=2.36-9+deb12u4 \
wget=1.21.3-1+b1 \
gnupg=2.2.40-1.1 \
&& wget --progress=dot:giga https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list \
&& (wget -qO- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg) \
&& wget --progress=dot:giga https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list \
&& (wget -qO- https://ryanfortner.github.io/box86-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg) \
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
box64-arm64 \
box86-generic-arm \
&& sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
# Create unprivileged user
Expand Down
41 changes: 11 additions & 30 deletions bullseye/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,6 @@ RUN set -x \

############################################################

FROM arm64v8/debian:bullseye-slim as box_generic_build

ENV DEBIAN_FRONTEND noninteractive

# Set SHELL option explicitly
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# hadolint ignore=DL3008
RUN set -x \
&& dpkg --add-architecture armhf \
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
ca-certificates=20210119 \
wget=1.21-1+deb11u1 \
gnupg=2.2.27-2+deb11u2 \
# Install, update & upgrade packages
&& wget --progress=dot:giga https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list \
&& (wget -qO- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg) \
&& wget --progress=dot:giga https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list \
&& (wget -qO- https://ryanfortner.github.io/box86-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg) \
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
box64-arm64 \
box86-generic-arm \
&& rm -rf /var/lib/apt/lists/*

############################################################

FROM arm64v8/python:slim-bullseye as box64_8k_build

ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -130,12 +102,11 @@ ENV DEBUGGER "/usr/local/bin/box86"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

COPY --from=qemu_build /usr/bin/qemu-i386-static /usr/bin/qemu-i386-static
COPY --from=box_generic_build /usr/local/bin/box86 /usr/local/bin/box86
COPY --from=box_generic_build /usr/local/bin/box64 /usr/local/bin/box64
COPY --from=box64_8k_build /tmp/install/usr/local/bin/box64 /usr/local/bin/box64-8k
COPY --from=box64_16k_build /tmp/install/usr/local/bin/box64 /usr/local/bin/box64-16k
COPY --from=box64_64k_build /tmp/install/usr/local/bin/box64 /usr/local/bin/box64-64k

# hadolint ignore=DL3008
RUN set -x \
# Install, update & upgrade packages
&& dpkg --add-architecture armhf \
Expand All @@ -149,6 +120,16 @@ RUN set -x \
nano=5.4-2+deb11u2 \
curl=7.74.0-1.3+deb11u11 \
locales=2.31-13+deb11u7 \
wget=1.21-1+deb11u1 \
gnupg=2.2.27-2+deb11u2 \
&& wget --progress=dot:giga https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list \
&& (wget -qO- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg) \
&& wget --progress=dot:giga https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list \
&& (wget -qO- https://ryanfortner.github.io/box86-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg) \
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
box64-arm64 \
box86-generic-arm \
&& sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
# Create unprivileged user
Expand Down

0 comments on commit 456db43

Please sign in to comment.