Skip to content

Commit 616cb5b

Browse files
author
User Ahze
committed
Add OCI pkg labels
1 parent 51fec08 commit 616cb5b

1 file changed

Lines changed: 15 additions & 13 deletions

File tree

15/Containerfile

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
ARG FREEBSD_RELEASE=15.0
22
FROM ghcr.io/freebsd/freebsd-runtime:${FREEBSD_RELEASE}
33

4-
LABEL org.opencontainers.image.title="base" \
5-
org.opencontainers.image.description="FreeBSD base image with s6 supervision" \
6-
org.opencontainers.image.source="https://github.com/daemonless/base" \
7-
org.opencontainers.image.url="https://github.com/daemonless/base" \
8-
org.opencontainers.image.licenses="BSD-2-Clause" \
9-
org.opencontainers.image.vendor="daemonless" \
10-
org.opencontainers.image.authors="daemonless"
11-
124
ARG FREEBSD_MAJOR=15
135
ARG FREEBSD_ARCH=amd64
146
ARG PKG_BRANCH=latest
7+
ARG PACKAGES="s6 s6-rc execline FreeBSD-utilities"
8+
9+
LABEL org.opencontainers.image.title="base" \
10+
org.opencontainers.image.description="FreeBSD base image with s6 supervision" \
11+
org.opencontainers.image.source="https://github.com/daemonless/base" \
12+
org.opencontainers.image.url="https://github.com/daemonless/base" \
13+
org.opencontainers.image.licenses="BSD-2-Clause" \
14+
org.opencontainers.image.vendor="daemonless" \
15+
org.opencontainers.image.authors="daemonless" \
16+
io.daemonless.packages="${PACKAGES}"
1517

1618
ENV ASSUME_ALWAYS_YES=yes
1719
ENV PUID=1000
@@ -26,7 +28,7 @@ COPY root/ /
2628
# Fix /usr/local/sbin permissions (pkg creates it as 700)
2729
RUN rm -rf /usr/local/etc/pkg/repos && \
2830
pkg update && \
29-
pkg install -y s6 s6-rc execline FreeBSD-utilities && \
31+
pkg install -y ${PACKAGES} && \
3032
chmod 755 /usr/local/sbin && \
3133
pkg clean -ay && \
3234
rm -rf /var/cache/pkg/* /var/db/pkg/repos/*
@@ -37,10 +39,10 @@ RUN pw groupadd -n bsd -g 1000 && \
3739

3840
# Create directory structure for init scripts
3941
RUN mkdir -p /etc/cont-init.d \
40-
/etc/services.d \
41-
/custom-cont-init.d \
42-
/custom-services.d \
43-
/run/s6/services
42+
/etc/services.d \
43+
/custom-cont-init.d \
44+
/custom-services.d \
45+
/run/s6/services
4446

4547
# Make scripts executable
4648
RUN chmod +x /init /etc/cont-init.d/* 2>/dev/null || true

0 commit comments

Comments
 (0)