Skip to content

Commit

Permalink
Support again Debian Buster armv6 (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
Paulchen-Panther authored Oct 18, 2023
1 parent 4d2db23 commit de19a64
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 5 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: ${{ github.event_name == 'schedule' && '⏰ Scheduled build' || github

on:
schedule:
- cron: '0 0 * * *'
- cron: '0 0 * * 0'
push:
branches: [ master ]

Expand All @@ -22,7 +22,6 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false

matrix:
os: [
{ distribution: ubuntu, codename: focal, description: Ubuntu 20.04 (Focal Fossa) },
Expand All @@ -37,7 +36,7 @@ jobs:
include:
# declare the following target_platform for all matrix jobs
- target_platform: linux/amd64,linux/arm64,linux/arm/v7
# overwrite target_platform for the following matrix jobs (include armv5)
# overwrite target_platform for the following matrix jobs (include linux/arm/v5)
- os: { distribution: debian, codename: bullseye }
target_platform: linux/amd64,linux/arm64,linux/arm/v5,linux/arm/v7
- os: { distribution: debian, codename: bookworm }
Expand Down Expand Up @@ -77,7 +76,7 @@ jobs:
maintainer=Hyperion Project <admin@hyperion-project.org>
org.opencontainers.image.vendor=Hyperion Project
org.opencontainers.image.title=${{ matrix.os.description }}
org.opencontainers.image.description=Compilation environment to build the DEB packages for the APT Repository
org.opencontainers.image.description=Compilation environment to build Hyperion for ${{ matrix.os.distribution }} ${{ matrix.os.codename }}
org.opencontainers.image.url=${{ github.server_url }}
org.opencontainers.image.source=${{ github.server_url }}/hyperion.docker-ci
org.opencontainers.image.documentation=https://docs.hyperion-project.org/
Expand All @@ -88,7 +87,7 @@ jobs:
with:
context: .
file: ubuntu_debian
push: ${{ env.SECRET_DOCKER_CI != null }}
push: true
platforms: ${{ matrix.target_platform }}
provenance: false
tags: ${{ steps.docker_metadata.outputs.tags }}
Expand All @@ -98,6 +97,14 @@ jobs:
SUITE=${{ matrix.os.codename }}
REPOSITORY="${{ github.server_url }}/${{ env.REPOSITORY }}"
- name: 🐳 Set up, 👷 Build, 🔀 Combine and 🚀 Push Debian Buster armv6 image
if: ${{ matrix.os.codename == 'buster' }}
run: |
docker buildx build --provenance=false --push --tag ghcr.io/${{ env.REPOSITORY }}/${{ matrix.os.distribution }}:${{ env.FILE_TAG }} --platform linux/arm/v5 --file ${{ env.FILE_TAG }} .
docker buildx imagetools create -t ${{ steps.docker_metadata.outputs.tags }} --append ghcr.io/${{ env.REPOSITORY }}/${{ matrix.os.distribution }}:${{ env.FILE_TAG }}
env:
FILE_TAG: buster-armv6

####################
###### Fedora ######
####################
Expand Down
42 changes: 42 additions & 0 deletions buster-armv6
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
ARG DIST="debian"
ARG SUITE="buster"
ARG REPOSITORY="https://github.com/hyperion-project"

FROM balenalib/raspberry-pi:buster-build

ARG REPOSITORY
ARG TARGETPLATFORM

LABEL maintainer="Hyperion Project <admin@hyperion-project.org>" \
org.opencontainers.image.title="Debian Buster ${TARGETPLATFORM}" \
org.opencontainers.image.description="Compilation environment to build Hyperion for Debian Buster" \
org.opencontainers.image.url="${REPOSITORY}" \
org.opencontainers.image.source="${REPOSITORY}/hyperion.docker-ci" \
org.opencontainers.image.vendor="Hyperion Project" \
org.opencontainers.image.documentation="https://docs.hyperion-project.org" \
org.opencontainers.image.licenses="MIT"

# install deps
RUN install_packages \
git \
python3-dev \
qtbase5-dev \
libqt5serialport5-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
build-essential \
libusb-1.0-0-dev \
libcec-dev \
libavahi-core-dev \
libavahi-compat-libdnssd-dev \
zlib1g-dev \
libraspberrypi-dev \
libssl1.0-dev \
libasound2-dev \
libjpeg-dev \
libturbojpeg0-dev \
libftdi1-dev && \
cmake=3.13.4-1 && \
apt-get clean -q -y && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
9 changes: 9 additions & 0 deletions ubuntu_debian
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ ARG SUITE
ARG REPOSITORY
ARG TARGETPLATFORM

LABEL maintainer="Hyperion Project <admin@hyperion-project.org>" \
org.opencontainers.image.title="${DIST} ${SUITE} ${TARGETPLATFORM}" \
org.opencontainers.image.description="Compilation environment to build Hyperion for ${DIST} ${SUITE}" \
org.opencontainers.image.url="${REPOSITORY}" \
org.opencontainers.image.source="${REPOSITORY}/hyperion.docker-ci" \
org.opencontainers.image.vendor="Hyperion Project" \
org.opencontainers.image.documentation="https://docs.hyperion-project.org" \
org.opencontainers.image.licenses="MIT"

ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
ENV DEBFULLNAME="Hyperion Project"
ENV DEBEMAIL="admin@hyperion-project.org"
Expand Down

0 comments on commit de19a64

Please sign in to comment.