Skip to content

Commit 3faa42c

Browse files
committed
Layer base on base-core; add CIT shell test
1 parent 31fa1a0 commit 3faa42c

2 files changed

Lines changed: 26 additions & 41 deletions

File tree

Containerfile

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
# Source: Containerfile.j2
55
# --------------------------------------------------------------------------
66

7-
ARG FREEBSD_RELEASE=15.0
8-
FROM ghcr.io/freebsd/freebsd-runtime:${FREEBSD_RELEASE}
7+
ARG BASE_VERSION=15-pkg
8+
FROM ghcr.io/daemonless/base-core:${BASE_VERSION}
99

10-
ARG FREEBSD_MAJOR=15
11-
ARG PKG_BRANCH=quarterly
12-
ARG PACKAGES="s6 s6-rc execline FreeBSD-utilities jq"
10+
ARG PACKAGES="s6 s6-rc execline"
1311
ARG VERSION=""
1412

1513
LABEL org.opencontainers.image.title="FreeBSD Base" \
@@ -23,41 +21,13 @@ LABEL org.opencontainers.image.title="FreeBSD Base" \
2321
io.daemonless.category="Base" \
2422
io.daemonless.packages="${PACKAGES}"
2523

26-
ENV ASSUME_ALWAYS_YES=yes
27-
ENV PUID=1000
28-
ENV PGID=1000
29-
ENV TZ=UTC
30-
3124
COPY root/ /
3225

33-
RUN mkdir -p /etc/pkg && \
34-
printf '%s\n' \
35-
'FreeBSD-ports-kmods: { enabled: no }' \
36-
'FreeBSD-base: {' \
37-
' url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}",' \
38-
' mirror_type: "srv",' \
39-
' signature_type: "fingerprints",' \
40-
' fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}",' \
41-
' enabled: yes' \
42-
'}' \
43-
'FreeBSD-Ports: {' \
44-
" url: \"pkg+https://pkg.FreeBSD.org/\${ABI}/${PKG_BRANCH}\"," \
45-
' mirror_type: "srv",' \
46-
' signature_type: "fingerprints",' \
47-
' fingerprints: "/usr/share/keys/pkg",' \
48-
' enabled: yes' \
49-
'}' > /etc/pkg/FreeBSD.conf
50-
51-
RUN rm -rf /usr/local/etc/pkg/repos && \
52-
pkg update && \
26+
RUN pkg update && \
5327
pkg install -y ${PACKAGES} && \
54-
chmod 755 /usr/local/sbin && \
5528
pkg clean -ay && \
5629
rm -rf /var/cache/pkg/* /var/db/pkg/repos/*
5730

58-
RUN pw groupadd -n bsd -g 1000 && \
59-
pw useradd -n bsd -u 1000 -g bsd -d /config -s /bin/sh -c "Container User"
60-
6131
RUN mkdir -p /etc/cont-init.d \
6232
/etc/services.d \
6333
/custom-cont-init.d \

README.md

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,32 @@
11
<!--
22
THIS FILE IS AUTOGENERATED - DO NOT EDIT MANUALLY
3-
Source: daemonless/templates/README.j2
3+
Source: dbuild templates
44
-->
55

66
# FreeBSD Base
77

8+
[![Build Status](https://img.shields.io/github/actions/workflow/status/daemonless/base/build.yaml?style=flat-square&label=Build&color=green)](https://github.com/daemonless/base/actions)
9+
[![Last Commit](https://img.shields.io/github/last-commit/daemonless/base?style=flat-square&label=Last+Commit&color=blue)](https://github.com/daemonless/base/commits)
10+
811
FreeBSD base image with s6 supervision
912

1013
| | |
1114
|---|---|
1215
| **Registry** | `ghcr.io/daemonless/base` |
13-
| **Docs** | [daemonless.io/images/base](https://daemonless.io/images/base/) |
1416
| **Source** | [https://github.com/freebsd/freebsd-src](https://github.com/freebsd/freebsd-src) |
1517
| **Website** | [https://www.freebsd.org/](https://www.freebsd.org/) |
1618

19+
## Version Tags
20+
21+
| Tag | Description | Best For |
22+
| :--- | :--- | :--- |
23+
| `15` / `15-quarterly` / `latest` | **FreeBSD Port**. Built from FreeBSD packages. | Production stability. |
24+
| `15-latest` | **FreeBSD Latest**. Rolling package updates. | Newest FreeBSD packages. |
25+
26+
## Prerequisites
27+
28+
Before deploying, ensure your host environment is ready. See the [Quick Start Guide](https://daemonless.io/guides/quick-start) for host setup instructions.
29+
1730
## Deployment
1831

1932
### Podman Compose
@@ -44,10 +57,12 @@ podman run -d --name base \
4457
restart_policy: always
4558
```
4659
47-
## Configuration
60+
## Parameters
61+
62+
**Architectures:** amd64
63+
**User:** `root` (UID/GID via PUID/PGID, defaults to 1000:1000)
64+
**Base:** FreeBSD 15.0
4865

49-
## Notes
66+
---
5067

51-
- **Architectures:** amd64
52-
- **User:** `root` (UID/GID set via PUID/PGID)
53-
- **Base:** Built on `ghcr.io/daemonless/base` (FreeBSD)
68+
Need help? Join our [Discord](https://discord.gg/Kb9tkhecZT) community.

0 commit comments

Comments
 (0)