Skip to content

Commit

Permalink
Merge pull request #27 from Ultramarine-Linux/cappy/layered-devtools
Browse files Browse the repository at this point in the history
layered devtools image
  • Loading branch information
madonuko authored Jul 18, 2024
2 parents 0c97747 + 8539312 commit eb92eab
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 78 deletions.
37 changes: 33 additions & 4 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ jobs:
variant:
- base/base-docker-x86_64
- base/base-docker-aarch64
- base/devtools-docker-aarch64
- base/devtools-docker-x86_64

outputs:
artifact: ${{ matrix.variant }}
Expand Down Expand Up @@ -115,8 +113,6 @@ jobs:
#### DOCKER PUSH ######

docker-push:
strategy:
fail-fast: false
runs-on: ubuntu-latest
needs: docker
if: github.event_name != 'pull_request'
Expand Down Expand Up @@ -148,5 +144,38 @@ jobs:
# also tag as latest
buildah tag $MANIFEST $MANIFEST:latest || :
buildah manifest push --all --format v2s2 $MANIFEST docker://$MANIFEST:$RELEASE
docker-layer:
runs-on: ubuntu-latest
needs: docker-push
strategy:
fail-fast: true
matrix:
version:
- 40
dockerfile:
- dockerfiles/devtools.dockerfile

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build images
uses: docker/build-push-action@v6
with:
context: .
file: ${{ matrix.dockerfile }}
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/ultramarine-linux/ultramarine-devtools:${{ matrix.version }}
ghcr.io/ultramarine-linux/ultramarine-devtools:latest
build-args: |
RELEASE=${{ matrix.version }}

#### LIVE ISO ####
5 changes: 5 additions & 0 deletions dockerfiles/devtools.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ARG RELEASE

FROM ghcr.io/ultramarine-linux/ultramarine:${RELEASE}

RUN dnf install -y @development-tools && dnf clean all
37 changes: 0 additions & 37 deletions katsu/modules/base/devtools-docker-aarch64.yaml

This file was deleted.

37 changes: 0 additions & 37 deletions katsu/modules/base/devtools-docker-x86_64.yaml

This file was deleted.

0 comments on commit eb92eab

Please sign in to comment.