Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use OCI annotations for 2nd layer images #47

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Use OCI annotations for 2nd layer images #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-2nd-layer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ jobs:
./Containerfile-${{ matrix.type }}
labels: |
name=rockylinux
version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
org.opencontainers.image.title=rockylinux
org.opencontainers.image.version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
oci: true
tags: ${{ matrix.registry.domain }}/${{ matrix.registry.account }}/rockylinux:${{ matrix.version.major }}-ubi-${{ matrix.type }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
./Containerfile-${{ matrix.type }}
labels: |
name=rockylinux
version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
org.opencontainers.image.title=rockylinux
org.opencontainers.image.version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
oci: true
tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ACCOUNT }}/rockylinux:${{ matrix.version.major }}-ubi-${{ matrix.type }}
7 changes: 5 additions & 2 deletions Containerfile-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ ARG ImageVersion

FROM rockylinux/rockylinux:$ImageVersion-ubi
LABEL summary="Rocky Linux UBI init image" \
description="This image is designed to run an init system as PID 1 for running multi-services inside a container." \
usage="Do not use directly. Use as a base image for daemons. Install chosen packages and 'systemctl enable' them." \
maintainer="Magauer Lukas <lukas@magauer.eu>"
org.opencontainers.image.authors="Magauer Lukas <lukas@magauer.eu>" \
org.opencontainers.image.description="This image is designed to run an init system as PID 1 for running multi-services inside a container." \
org.opencontainers.image.licenses="BSD-3-Clause" \
org.opencontainers.image.url="https://github.com/rocky-linux/sig-cloud-instance-images" \
org.opencontainers.image.vendor="Rocky Enterprise Software Foundation"

CMD ["/sbin/init"]

Expand Down
7 changes: 5 additions & 2 deletions Containerfile-micro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/

FROM scratch
LABEL summary="Rocky Linux UBI micro image" \
description="Very small image which doesn't install the package manager." \
maintainer="Magauer Lukas <lukas@magauer.eu>"
org.opencontainers.image.authors="Magauer Lukas <lukas@magauer.eu>" \
org.opencontainers.image.description="Very small image which doesn't install the package manager." \
org.opencontainers.image.licenses="BSD-3-Clause" \
org.opencontainers.image.url="https://github.com/rocky-linux/sig-cloud-instance-images" \
org.opencontainers.image.vendor="Rocky Enterprise Software Foundation"

COPY --from=ubi-micro-build /mnt/rootfs/ /
COPY --from=ubi-micro-build /etc/yum.repos.d/* /etc/yum.repos.d/
Expand Down