Skip to content

Commit

Permalink
[docker-images] Add images for 'current' flavour
Browse files Browse the repository at this point in the history
Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>
  • Loading branch information
g7 committed May 12, 2024
1 parent b2f19d4 commit 79ac410
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/base-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
arch: [amd64, armhf, arm64]
template: [base]
dist: [next]
dist: [current, next]
namespace: [droidian]

name: ${{ matrix.template }}:${{ matrix.dist }} on ${{ matrix.arch }}
Expand Down
34 changes: 34 additions & 0 deletions Dockerfile.amd64_droidian_base_current
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
ARG ARCH=
FROM scratch
ADD base-amd64-current.tar /

ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NOWARNINGS yes
ENV DEBIAN_PRIORITY critical

# Copy relevant repositories and keyrings
# Note: .dummy files used to keep the directory hierarchy in git are
# copied too, see moby/moby#26332
COPY repositories/current/all/* /etc/apt/sources.list.d/
COPY repositories/current/amd64/* /etc/apt/sources.list.d/

# Copy apt preferences
COPY preferences/current/* /etc/apt/preferences.d/

COPY keyrings/all/* /etc/apt/droidian-gpg.d/
COPY keyrings/amd64/* /etc/apt/droidian-gpg.d/

COPY common/apt.conf.d/* /etc/apt/apt.conf.d/

# Special handling for i386 packages
RUN \
if [ "amd64" = "amd64" ]; then \
ln -s /usr/share/droidian-release/buildd_support.list /etc/apt/sources.list.d/buildd_support.list; \
dpkg --add-architecture i386; \
fi

# Add secondary architectures
RUN \
dpkg --add-architecture arm64 && \
dpkg --add-architecture armhf && \
apt-get update
34 changes: 34 additions & 0 deletions Dockerfile.arm64_droidian_base_current
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
ARG ARCH=
FROM scratch
ADD base-arm64-current.tar /

ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NOWARNINGS yes
ENV DEBIAN_PRIORITY critical

# Copy relevant repositories and keyrings
# Note: .dummy files used to keep the directory hierarchy in git are
# copied too, see moby/moby#26332
COPY repositories/current/all/* /etc/apt/sources.list.d/
COPY repositories/current/arm64/* /etc/apt/sources.list.d/

# Copy apt preferences
COPY preferences/current/* /etc/apt/preferences.d/

COPY keyrings/all/* /etc/apt/droidian-gpg.d/
COPY keyrings/arm64/* /etc/apt/droidian-gpg.d/

COPY common/apt.conf.d/* /etc/apt/apt.conf.d/

# Special handling for i386 packages
RUN \
if [ "arm64" = "amd64" ]; then \
ln -s /usr/share/droidian-release/buildd_support.list /etc/apt/sources.list.d/buildd_support.list; \
dpkg --add-architecture i386; \
fi

# Add secondary architectures
RUN \
dpkg --add-architecture arm64 && \
dpkg --add-architecture armhf && \
apt-get update
34 changes: 34 additions & 0 deletions Dockerfile.armhf_droidian_base_current
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
ARG ARCH=
FROM scratch
ADD base-armhf-current.tar /

ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NOWARNINGS yes
ENV DEBIAN_PRIORITY critical

# Copy relevant repositories and keyrings
# Note: .dummy files used to keep the directory hierarchy in git are
# copied too, see moby/moby#26332
COPY repositories/current/all/* /etc/apt/sources.list.d/
COPY repositories/current/armhf/* /etc/apt/sources.list.d/

# Copy apt preferences
COPY preferences/current/* /etc/apt/preferences.d/

COPY keyrings/all/* /etc/apt/droidian-gpg.d/
COPY keyrings/armhf/* /etc/apt/droidian-gpg.d/

COPY common/apt.conf.d/* /etc/apt/apt.conf.d/

# Special handling for i386 packages
RUN \
if [ "armhf" = "amd64" ]; then \
ln -s /usr/share/droidian-release/buildd_support.list /etc/apt/sources.list.d/buildd_support.list; \
dpkg --add-architecture i386; \
fi

# Add secondary architectures
RUN \
dpkg --add-architecture arm64 && \
dpkg --add-architecture armhf && \
apt-get update
Empty file added preferences/current/.dummy
Empty file.
5 changes: 5 additions & 0 deletions preferences/current/10-debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Always prefer packages coming from Droidian snapshots
Package: *
Pin: release o=Debian
Pin-Priority: 100

Empty file added repositories/current/all/.dummy
Empty file.
Empty file.
Empty file.
Empty file.

0 comments on commit 79ac410

Please sign in to comment.