Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5be7976f0a | ||
|
|
959769a05c | ||
|
|
6883446078 | ||
|
|
dc02217869 | ||
|
|
968880f2cc | ||
|
|
01e08053a2 |
20
.github/workflows/main.yml
vendored
20
.github/workflows/main.yml
vendored
@@ -32,7 +32,7 @@ jobs:
|
|||||||
make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
|
make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
|
||||||
- name: "Upload artifacts"
|
- name: "Upload artifacts"
|
||||||
if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
|
if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
|
||||||
uses: "actions/upload-artifact@v4"
|
uses: "christopherhx/gitea-upload-artifact@v4"
|
||||||
with:
|
with:
|
||||||
name: "dist-${{ matrix.arch }}"
|
name: "dist-${{ matrix.arch }}"
|
||||||
path: "./dist/"
|
path: "./dist/"
|
||||||
@@ -52,14 +52,14 @@ jobs:
|
|||||||
- name: "Checkout project"
|
- name: "Checkout project"
|
||||||
uses: "actions/checkout@v4"
|
uses: "actions/checkout@v4"
|
||||||
- name: "Download artifacts"
|
- name: "Download artifacts"
|
||||||
uses: "actions/download-artifact@v4"
|
uses: "christopherhx/gitea-download-artifact@v4"
|
||||||
with:
|
with:
|
||||||
name: "dist-${{ matrix.arch }}"
|
name: "dist-${{ matrix.arch }}"
|
||||||
path: "./dist/"
|
path: "./dist/"
|
||||||
- name: "Login to Docker Hub"
|
# - name: "Login to Docker Hub"
|
||||||
uses: "docker/login-action@v3"
|
# uses: "docker/login-action@v3"
|
||||||
with:
|
# with:
|
||||||
registry: "d.lilpenguins.com"
|
# registry: "d.lilpenguins.com"
|
||||||
- name: "Load and push image"
|
- name: "Load and push image"
|
||||||
run: |
|
run: |
|
||||||
make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
|
make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
|
||||||
@@ -74,10 +74,10 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: "Checkout project"
|
- name: "Checkout project"
|
||||||
uses: "actions/checkout@v4"
|
uses: "actions/checkout@v4"
|
||||||
- name: "Login to Docker Hub"
|
# - name: "Login to Docker Hub"
|
||||||
uses: "docker/login-action@v3"
|
# uses: "docker/login-action@v3"
|
||||||
with:
|
# with:
|
||||||
registry: "d.lilpenguins.com"
|
# registry: "d.lilpenguins.com"
|
||||||
- name: "Push manifest"
|
- name: "Push manifest"
|
||||||
run: |
|
run: |
|
||||||
make push-cross-manifest
|
make push-cross-manifest
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ EOF
|
|||||||
## "main" stage
|
## "main" stage
|
||||||
##################################################
|
##################################################
|
||||||
|
|
||||||
m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS main
|
m4_ifdef([[CROSS_ARCH]], [[FROM dtcooper/raspberrypi-os:latest]], [[FROM dtcooper/raspberrypi-os:latest]]) AS main
|
||||||
|
|
||||||
SHELL ["/bin/sh", "-euc"]
|
SHELL ["/bin/sh", "-euc"]
|
||||||
|
|
||||||
@@ -248,6 +248,11 @@ RUN <<-EOF
|
|||||||
find /etc/apt/preferences.d/ -type f -not -perm 0644 -exec chmod 0644 '{}' ';'
|
find /etc/apt/preferences.d/ -type f -not -perm 0644 -exec chmod 0644 '{}' ';'
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
RUN <<-EOF
|
||||||
|
sed -i '/^Types: deb$/s/$/ deb-src/' /etc/apt/sources.list.d/debian.sources
|
||||||
|
sed -i '/^Components: main$/s/$/ contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources
|
||||||
|
EOF
|
||||||
|
|
||||||
# Install base packages
|
# Install base packages
|
||||||
RUN <<-EOF
|
RUN <<-EOF
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
@@ -279,7 +284,7 @@ RUN <<-EOF
|
|||||||
libpam0g \
|
libpam0g \
|
||||||
libpixman-1-0 \
|
libpixman-1-0 \
|
||||||
libpulse0 \
|
libpulse0 \
|
||||||
libssl3t64 \
|
libssl3 \
|
||||||
libsystemd0 \
|
libsystemd0 \
|
||||||
libx11-6 \
|
libx11-6 \
|
||||||
libx11-xcb1 \
|
libx11-xcb1 \
|
||||||
@@ -292,7 +297,7 @@ RUN <<-EOF
|
|||||||
libxml2 \
|
libxml2 \
|
||||||
libxrandr2 \
|
libxrandr2 \
|
||||||
libxshmfence1 \
|
libxshmfence1 \
|
||||||
libxt6t64 \
|
libxt6 \
|
||||||
libxtst6 \
|
libxtst6 \
|
||||||
libxv1 \
|
libxv1 \
|
||||||
locales \
|
locales \
|
||||||
|
|||||||
Reference in New Issue
Block a user