Skip to content

Commit 6046d57

Browse files
AzathothasAzathothas
committed
saner
1 parent 43b6878 commit 6046d57

File tree

2 files changed

+79
-70
lines changed

2 files changed

+79
-70
lines changed

‎.github/workflows/build_gh_runner_images.yaml‎

Lines changed: 77 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,21 @@ jobs:
314314
push: true
315315
continue-on-error: true
316316
#------------------------------------------------------------------------------------#
317-
build-push-docker-ubuntu-base-aarch64:
318-
name: Push (Ubuntu-Base-aarch64) --> Docker Hub
319-
#runs-on: arm64-linux-healthchecker
320-
#runs-on: ubuntu-latest
321-
runs-on: ubuntu-24.04-arm
317+
build-push-ubuntu-builder:
318+
name: Push (Ubuntu-Builder ${{ matrix.arch }}) --> Docker Hub
319+
runs-on: ${{ matrix.runner }}
320+
strategy:
321+
matrix:
322+
include:
323+
- arch: aarch64
324+
platform: arm64
325+
runner: ubuntu-24.04-arm
326+
- arch: riscv64
327+
platform: riscv64
328+
runner: ubuntu-latest
329+
- arch: x86_64
330+
platform: amd64
331+
runner: ubuntu-latest
322332

323333
steps:
324334
- name: Checkout repository
@@ -345,7 +355,7 @@ jobs:
345355
echo "DOCKER_TAG=${DOCKER_TAG}" >> "${GITHUB_ENV}"
346356
#Copy dockerfiles
347357
mkdir -p "/tmp/DOCKERFILES" && cd "/tmp/DOCKERFILES"
348-
cp "${GITHUB_WORKSPACE}/main/Github/Runners/ubuntu-systemd-base.dockerfile" "/tmp/DOCKERFILES/ubuntu-systemd-base.dockerfile"
358+
cp "${GITHUB_WORKSPACE}/main/Github/Runners/ubuntu-builder.dockerfile" "/tmp/DOCKERFILES/ubuntu-builder.dockerfile"
349359
continue-on-error: true
350360

351361
- name: Set up QEMU
@@ -371,25 +381,28 @@ jobs:
371381
password: "${{ secrets.GITHUB_TOKEN }}"
372382
continue-on-error: true
373383

374-
#https://hub.docker.com/r/pkgforge/ubuntu-systemd-base
375-
- name: Docker Build and Push (Ubuntu-Systemd-Base)
384+
#https://hub.docker.com/r/pkgforge/ubuntu-builder
385+
- name: Docker Build and Push (ubuntu-builder)
376386
uses: docker/build-push-action@v6
377387
with:
378388
context: /tmp/DOCKERFILES/
379-
file: "/tmp/DOCKERFILES/ubuntu-systemd-base.dockerfile"
380-
platforms: "linux/arm64"
389+
file: "/tmp/DOCKERFILES/ubuntu-builder.dockerfile"
390+
platforms: "linux/${{ matrix.platform }}"
381391
tags: |
382-
pkgforge/ubuntu-systemd-base:aarch64
383-
pkgforge/ubuntu-systemd-base:aarch64-${{ env.DOCKER_TAG }}
384-
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:aarch64
385-
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:aarch64-${{ env.DOCKER_TAG }}
386-
push: true
392+
pkgforge/ubuntu-builder:${{ matrix.arch }}
393+
pkgforge/ubuntu-builder:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
394+
ghcr.io/pkgforge/devscripts/ubuntu-builder:${{ matrix.arch }}
395+
ghcr.io/pkgforge/devscripts/ubuntu-builder:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
396+
push: true
387397
continue-on-error: true
388398
#------------------------------------------------------------------------------------#
389-
build-push-docker-ubuntu-base-riscv64:
390-
name: Push (Ubuntu-Base-riscv64) --> Docker Hub
391-
runs-on: ubuntu-latest
392-
399+
build-push-docker-ubuntu-base-aarch64:
400+
name: Push (Ubuntu-Base-aarch64) --> Docker Hub
401+
needs: [build-push-ubuntu-builder]
402+
#runs-on: arm64-linux-healthchecker
403+
#runs-on: ubuntu-latest
404+
runs-on: ubuntu-24.04-arm
405+
393406
steps:
394407
- name: Checkout repository
395408
uses: actions/checkout@v4
@@ -447,17 +460,20 @@ jobs:
447460
with:
448461
context: /tmp/DOCKERFILES/
449462
file: "/tmp/DOCKERFILES/ubuntu-systemd-base.dockerfile"
450-
platforms: "linux/riscv64"
463+
platforms: "linux/arm64"
464+
build-args: |
465+
ARCH=aarch64
451466
tags: |
452-
pkgforge/ubuntu-systemd-base:riscv64
453-
pkgforge/ubuntu-systemd-base:riscv64-${{ env.DOCKER_TAG }}
454-
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:riscv64
455-
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:riscv64-${{ env.DOCKER_TAG }}
456-
push: true
467+
pkgforge/ubuntu-systemd-base:aarch64
468+
pkgforge/ubuntu-systemd-base:aarch64-${{ env.DOCKER_TAG }}
469+
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:aarch64
470+
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:aarch64-${{ env.DOCKER_TAG }}
471+
push: true
457472
continue-on-error: true
458473
#------------------------------------------------------------------------------------#
459-
build-push-docker-ubuntu-base-x64:
460-
name: Push (Ubuntu-Base-x64) --> Docker Hub
474+
build-push-docker-ubuntu-base-riscv64:
475+
name: Push (Ubuntu-Base-riscv64) --> Docker Hub
476+
needs: [build-push-ubuntu-builder]
461477
runs-on: ubuntu-latest
462478

463479
steps:
@@ -517,31 +533,22 @@ jobs:
517533
with:
518534
context: /tmp/DOCKERFILES/
519535
file: "/tmp/DOCKERFILES/ubuntu-systemd-base.dockerfile"
520-
platforms: "linux/amd64"
536+
platforms: "linux/riscv64"
537+
build-args: |
538+
ARCH=riscv64
521539
tags: |
522-
pkgforge/ubuntu-systemd-base:x86_64
523-
pkgforge/ubuntu-systemd-base:x86_64-${{ env.DOCKER_TAG }}
524-
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:x86_64
525-
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:x86_64-${{ env.DOCKER_TAG }}
540+
pkgforge/ubuntu-systemd-base:riscv64
541+
pkgforge/ubuntu-systemd-base:riscv64-${{ env.DOCKER_TAG }}
542+
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:riscv64
543+
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:riscv64-${{ env.DOCKER_TAG }}
526544
push: true
527545
continue-on-error: true
528546
#------------------------------------------------------------------------------------#
529-
build-push-debian-unstable-base:
530-
name: Push (Debian-Builder ${{ matrix.arch }}) --> Docker Hub
531-
runs-on: ${{ matrix.runner }}
532-
strategy:
533-
matrix:
534-
include:
535-
- arch: aarch64
536-
platform: arm64
537-
runner: ubuntu-24.04-arm
538-
- arch: riscv64
539-
platform: riscv64
540-
runner: ubuntu-latest
541-
- arch: x86_64
542-
platform: amd64
543-
runner: ubuntu-latest
544-
547+
build-push-docker-ubuntu-base-x64:
548+
name: Push (Ubuntu-Base-x64) --> Docker Hub
549+
needs: [build-push-ubuntu-builder]
550+
runs-on: ubuntu-latest
551+
545552
steps:
546553
- name: Checkout repository
547554
uses: actions/checkout@v4
@@ -567,7 +574,7 @@ jobs:
567574
echo "DOCKER_TAG=${DOCKER_TAG}" >> "${GITHUB_ENV}"
568575
#Copy dockerfiles
569576
mkdir -p "/tmp/DOCKERFILES" && cd "/tmp/DOCKERFILES"
570-
cp "${GITHUB_WORKSPACE}/main/Github/Runners/debian-builder-unstable.dockerfile" "/tmp/DOCKERFILES/debian-builder-unstable.dockerfile"
577+
cp "${GITHUB_WORKSPACE}/main/Github/Runners/ubuntu-systemd-base.dockerfile" "/tmp/DOCKERFILES/ubuntu-systemd-base.dockerfile"
571578
continue-on-error: true
572579

573580
- name: Set up QEMU
@@ -593,23 +600,25 @@ jobs:
593600
password: "${{ secrets.GITHUB_TOKEN }}"
594601
continue-on-error: true
595602

596-
#https://hub.docker.com/r/pkgforge/debian-builder-unstable
597-
- name: Docker Build and Push (Debian-Unstable-Base)
603+
#https://hub.docker.com/r/pkgforge/ubuntu-systemd-base
604+
- name: Docker Build and Push (Ubuntu-Systemd-Base)
598605
uses: docker/build-push-action@v6
599606
with:
600607
context: /tmp/DOCKERFILES/
601-
file: "/tmp/DOCKERFILES/debian-builder-unstable.dockerfile"
602-
platforms: "linux/${{ matrix.platform }}"
608+
file: "/tmp/DOCKERFILES/ubuntu-systemd-base.dockerfile"
609+
platforms: "linux/amd64"
610+
build-args: |
611+
ARCH=x86_64
603612
tags: |
604-
pkgforge/debian-builder-unstable:${{ matrix.arch }}
605-
pkgforge/debian-builder-unstable:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
606-
ghcr.io/pkgforge/devscripts/debian-builder-unstable:${{ matrix.arch }}
607-
ghcr.io/pkgforge/devscripts/debian-builder-unstable:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
613+
pkgforge/ubuntu-systemd-base:x86_64
614+
pkgforge/ubuntu-systemd-base:x86_64-${{ env.DOCKER_TAG }}
615+
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:x86_64
616+
ghcr.io/pkgforge/devscripts/ubuntu-systemd-base:x86_64-${{ env.DOCKER_TAG }}
608617
push: true
609618
continue-on-error: true
610619
#------------------------------------------------------------------------------------#
611-
build-push-ubuntu-builder:
612-
name: Push (Ubuntu-Builder ${{ matrix.arch }}) --> Docker Hub
620+
build-push-debian-unstable-base:
621+
name: Push (Debian-Builder ${{ matrix.arch }}) --> Docker Hub
613622
runs-on: ${{ matrix.runner }}
614623
strategy:
615624
matrix:
@@ -623,7 +632,7 @@ jobs:
623632
- arch: x86_64
624633
platform: amd64
625634
runner: ubuntu-latest
626-
635+
627636
steps:
628637
- name: Checkout repository
629638
uses: actions/checkout@v4
@@ -649,7 +658,7 @@ jobs:
649658
echo "DOCKER_TAG=${DOCKER_TAG}" >> "${GITHUB_ENV}"
650659
#Copy dockerfiles
651660
mkdir -p "/tmp/DOCKERFILES" && cd "/tmp/DOCKERFILES"
652-
cp "${GITHUB_WORKSPACE}/main/Github/Runners/ubuntu-builder.dockerfile" "/tmp/DOCKERFILES/ubuntu-builder.dockerfile"
661+
cp "${GITHUB_WORKSPACE}/main/Github/Runners/debian-builder-unstable.dockerfile" "/tmp/DOCKERFILES/debian-builder-unstable.dockerfile"
653662
continue-on-error: true
654663

655664
- name: Set up QEMU
@@ -675,18 +684,18 @@ jobs:
675684
password: "${{ secrets.GITHUB_TOKEN }}"
676685
continue-on-error: true
677686

678-
#https://hub.docker.com/r/pkgforge/ubuntu-builder
679-
- name: Docker Build and Push (ubuntu-builder)
687+
#https://hub.docker.com/r/pkgforge/debian-builder-unstable
688+
- name: Docker Build and Push (Debian-Unstable-Base)
680689
uses: docker/build-push-action@v6
681690
with:
682691
context: /tmp/DOCKERFILES/
683-
file: "/tmp/DOCKERFILES/ubuntu-builder.dockerfile"
692+
file: "/tmp/DOCKERFILES/debian-builder-unstable.dockerfile"
684693
platforms: "linux/${{ matrix.platform }}"
685694
tags: |
686-
pkgforge/ubuntu-builder:${{ matrix.arch }}
687-
pkgforge/ubuntu-builder:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
688-
ghcr.io/pkgforge/devscripts/ubuntu-builder:${{ matrix.arch }}
689-
ghcr.io/pkgforge/devscripts/ubuntu-builder:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
695+
pkgforge/debian-builder-unstable:${{ matrix.arch }}
696+
pkgforge/debian-builder-unstable:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
697+
ghcr.io/pkgforge/devscripts/debian-builder-unstable:${{ matrix.arch }}
698+
ghcr.io/pkgforge/devscripts/debian-builder-unstable:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
690699
push: true
691700
continue-on-error: true
692701
#------------------------------------------------------------------------------------#

‎Github/Runners/ubuntu-systemd-base.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#------------------------------------------------------------------------------------#
33
# Usage: https://github.com/pkgforge/devscripts/blob/main/Github/Runners/README.md
44
#
5-
FROM ubuntu:latest
6-
#FROM ubuntu:jammy
5+
#FROM ubuntu:latest
6+
FROM "ghcr.io/pkgforge/devscripts/ubuntu-builder:${ARCH}"
77
#------------------------------------------------------------------------------------#
88
##Base Deps
99
ENV DEBIAN_FRONTEND="noninteractive"

0 commit comments

Comments
 (0)