chore: Add opencontainers labels and remove cleanup command

This commit is contained in:
Kyle Gospodnetich 2023-02-15 13:48:36 -08:00
parent 04eebbc3c1
commit ee721a5b90
3 changed files with 12 additions and 3 deletions

View File

@ -33,6 +33,16 @@ jobs:
- name: Checkout Push to Registry action
uses: actions/checkout@v3
# Build metadata
- name: Image Metadata
uses: docker/metadata-action@v4
id: meta
with:
images: |
${{ format('bazzite{0}', matrix.image_name) }}
labels: |
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/README.md
- name: Generate tags
id: generate-tags
shell: bash
@ -70,7 +80,8 @@ jobs:
build-args: |
IMAGE_NAME=${{ matrix.image_name }}
FEDORA_MAJOR_VERSION=${{ matrix.major_version }}
oci: true
labels: ${{ steps.meta.outputs.labels }}
oci: false
# Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
# https://github.com/macbre/push-to-ghcr/issues/12

View File

@ -73,7 +73,6 @@ RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree{,-update
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
systemctl enable rpm-ostreed-automatic.timer && \
rpm-ostree cleanup -m && \
rm -rf \
/tmp/* \
/var/* && \

View File

@ -56,7 +56,6 @@ RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree{,-update
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
systemctl enable rpm-ostreed-automatic.timer && \
rpm-ostree cleanup -m && \
rm -rf \
/tmp/* \
/var/* && \