Skip to content

Commit e57d85f

Browse files
committed
ci: building image with podman now
1 parent 5c9279f commit e57d85f

2 files changed

Lines changed: 35 additions & 42 deletions

File tree

.github/workflows/build-and-release.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,45 +48,45 @@ jobs:
4848
- name: Checkout repository
4949
uses: actions/checkout@v3
5050

51-
- name: Set up Docker
52-
uses: nxtcoder17/actions/setup-docker@main
53-
with:
54-
docker_registry: ${{ env.REGISTRY_URL }}
55-
docker_username: ${{ env.REGISTRY_USERNAME }}
56-
docker_password: ${{ env.REGISTRY_PASSWORD }}
57-
58-
# - name: Log in to the Container registry
59-
# uses: docker/login-action@v3
51+
# - name: Set up Docker
52+
# uses: nxtcoder17/actions/setup-docker@main
6053
# with:
61-
# registry: ${{ env.REGISTRY_URL }}
62-
# username: ${{ env.REGISTRY_USERNAME }}
63-
# password: ${{ env.REGISTRY_PASSWORD }}
54+
# docker_registry: ${{ env.REGISTRY_URL }}
55+
# docker_username: ${{ env.REGISTRY_USERNAME }}
56+
# docker_password: ${{ env.REGISTRY_PASSWORD }}
6457

65-
# - name: Build Image
66-
# id: build_image
67-
# shell: bash
68-
# env:
69-
# IMAGE: "ghcr.io/${{ github.repository}}:${{matrix.fedora_version}}"
70-
# run: |+
71-
# docker buildx build \
72-
# -t $IMAGE -f ./Containerfile . --build-arg FEDORA_VERSION=${{ matrix.fedora_version }}
73-
# docker push $IMAGE
58+
- name: Log in to the Container registry
59+
uses: docker/login-action@v3
60+
with:
61+
registry: ${{ env.REGISTRY_URL }}
62+
username: ${{ env.REGISTRY_USERNAME }}
63+
password: ${{ env.REGISTRY_PASSWORD }}
7464

7565
- name: Build Image
7666
id: build_image
7767
shell: bash
7868
env:
7969
IMAGE: "ghcr.io/${{ github.repository}}:${{matrix.fedora_version}}"
80-
buildx_cache_master: "ghcr.io/${{ github.repository }}:buildx-cache-master"
81-
buildx_cache: "ghcr.io/${{ github.repository }}:buildx-cache-${{matrix.fedora_version}}"
8270
run: |+
83-
docker buildx build -t $IMAGE -f ./Containerfile \
84-
--build-arg FEDORA_VERSION="${{ matrix.fedora_version }}" \
85-
--cache-to type=registry,ref="$buildx_cache",mode=max,compression=zstd,compression-level=13,force-compression=true \
86-
--cache-from type=registry,ref="$buildx_cache" \
87-
--cache-from type=registry,ref="$buildx_cache_master" \
88-
--output=type=image,compression=zstd,force-compression=true,compression-level=13,push=true \
89-
.
71+
podman buildx build \
72+
-t $IMAGE -f ./Containerfile . --build-arg FEDORA_VERSION=${{ matrix.fedora_version }}
73+
podman push $IMAGE
74+
75+
# - name: Build Image
76+
# id: build_image
77+
# shell: bash
78+
# env:
79+
# IMAGE: "ghcr.io/${{ github.repository}}:${{matrix.fedora_version}}"
80+
# buildx_cache_master: "ghcr.io/${{ github.repository }}:buildx-cache-master"
81+
# buildx_cache: "ghcr.io/${{ github.repository }}:buildx-cache-${{matrix.fedora_version}}"
82+
# run: |+
83+
# docker buildx build -t $IMAGE -f ./Containerfile \
84+
# --build-arg FEDORA_VERSION="${{ matrix.fedora_version }}" \
85+
# --cache-to type=registry,ref="$buildx_cache",mode=max,compression=zstd,compression-level=13,force-compression=true \
86+
# --cache-from type=registry,ref="$buildx_cache" \
87+
# --cache-from type=registry,ref="$buildx_cache_master" \
88+
# --output=type=image,compression=zstd,force-compression=true,compression-level=13,push=true \
89+
# .
9090

9191
# - name: Build Image
9292
# id: build_image

Containerfile

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,9 @@ FROM ghcr.io/ublue-os/silverblue-nvidia:${FEDORA_VERSION}
44
ARG FEDORA_VERSION="${FEDORA_VERSION:-42}"
55

66
# Customized Branding
7-
RUN <<EOF
8-
set -ex
9-
sed -i "s|^NAME=.*|NAME=nxtcoder17 edition silverblue ${FEDORA_VERSION}|" /usr/lib/os-release
10-
sed -i "s|^PRETTY_NAME=.*|PRETTY_NAME=nxtcoder17 edition silverblue ${FEDORA_VERSION}|" /usr/lib/os-release
11-
EOF
12-
13-
RUN <<EOF
14-
set -ex
15-
rpm-ostree install docker distrobox hyprland
16-
rpm-ostree cleanup -m
17-
ostree container commit
18-
EOF
7+
RUN sed -i "s|^NAME=.*|NAME=nxtcoder17 edition silverblue ${FEDORA_VERSION}|" /usr/lib/os-release
8+
RUN sed -i "s|^PRETTY_NAME=.*|PRETTY_NAME=nxtcoder17 edition silverblue ${FEDORA_VERSION}|" /usr/lib/os-release
199

10+
RUN rpm-ostree override remove firefox firefox-langpacks
11+
RUN rpm-ostree install docker distrobox hyprland
12+
RUN rpm-ostree cleanup -m && ostree container commit

0 commit comments

Comments
 (0)