Skip to content

refactor: use per-variant pkg_name instead of PYTHON_VERSION arg #4

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

Merged
DtxdF merged 1 commit into from
Jun 27, 2026
Merged

refactor: use per-variant pkg_name instead of PYTHON_VERSION arg #4

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
43 changes: 21 additions & 22 deletions .daemonless/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,58 @@ build:
pkg_name: python3
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "3"
BASE_VERSION: "15.1-pkg-latest"
aliases: ["3"]
- tag: 2-pkg-latest
pkg_name: python2
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "2"
BASE_VERSION: "15.1-pkg-latest"
aliases: ["2"]
- tag: 27-pkg-latest
pkg_name: python27
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "27"
BASE_VERSION: "15.1-pkg-latest"
- tag: 310-pkg-latest
pkg_name: python310
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "310"
BASE_VERSION: "15.1-pkg-latest"
- tag: 311-pkg-latest
pkg_name: python311
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "311"
BASE_VERSION: "15.1-pkg-latest"
- tag: 312-pkg-latest
pkg_name: python312
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "312"
BASE_VERSION: "15.1-pkg-latest"
aliases: ["pkg", "pkg-latest"]
- tag: 313-pkg-latest
pkg_name: python313
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "313"
BASE_VERSION: "15.1-pkg-latest"
- tag: 313t-pkg-latest
pkg_name: python313t
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "313t"
BASE_VERSION: "15.1-pkg-latest"
- tag: 314-pkg-latest
pkg_name: python314
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "314"
BASE_VERSION: "15.1-pkg-latest"
aliases: ["latest"]
- tag: 314t-pkg-latest
pkg_name: python314t
containerfile: Containerfile
args:
BASE_VERSION: "15-pkg-latest"
PYTHON_VERSION: "314t"
BASE_VERSION: "15.1-pkg-latest"
- tag: 315-pkg-latest
pkg_name: python315
containerfile: Containerfile
args:
BASE_VERSION: '15-pkg-latest'
PYTHON_VERSION: '315'
BASE_VERSION: "15.1-pkg-latest"
8 changes: 4 additions & 4 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
# Source: Containerfile.j2
# --------------------------------------------------------------------------

ARG BASE_VERSION=15
ARG BASE_VERSION=15.1-pkg-latest
FROM ghcr.io/daemonless/base-core:${BASE_VERSION}

ARG PYTHON_VERSION
ARG PKG_NAME
ARG FREEBSD_ARCH=amd64

LABEL org.opencontainers.image.title="Python" \
Expand All @@ -22,8 +22,8 @@ LABEL org.opencontainers.image.title="Python" \

# Install dependencies
RUN pkg update && \
pkg install -y python${PYTHON_VERSION} && \
pkg install -y ${PKG_NAME} && \
mkdir -p /app && \
pkg query %v python${PYTHON_VERSION} > /app/version && \
pkg query %v ${PKG_NAME} > /app/version && \
pkg clean -ay && \
rm -rf /var/cache/pkg/* /var/db/pkg/repos/*
8 changes: 4 additions & 4 deletions Containerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_VERSION=15
ARG BASE_VERSION=15.1-pkg-latest
FROM ghcr.io/daemonless/base-core:${BASE_VERSION}

ARG PYTHON_VERSION
ARG PKG_NAME
ARG FREEBSD_ARCH=amd64

LABEL org.opencontainers.image.title="Python" \
Expand All @@ -16,8 +16,8 @@ LABEL org.opencontainers.image.title="Python" \

# Install dependencies
RUN pkg update && \
pkg install -y python${PYTHON_VERSION} && \
pkg install -y ${PKG_NAME} && \
mkdir -p /app && \
pkg query %v python${PYTHON_VERSION} > /app/version && \
pkg query %v ${PKG_NAME} > /app/version && \
pkg clean -ay && \
rm -rf /var/cache/pkg/* /var/db/pkg/repos/*
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Python is an interpreted object-oriented programming language, and is often comp

**Architectures:** amd64
**User:** `root` (UID/GID via PUID/PGID, defaults to 1000:1000)
**Base:** FreeBSD 15
**Base:** FreeBSD 15.1-pkg-latest

---

Expand Down