This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new 0aee1cf Remove the Ubuntu OCI container
0aee1cf is described below
commit 0aee1cf2a0bf2c6dc623288d0ea13e6ff4130218
Author: Sean B. Palmer <[email protected]>
AuthorDate: Fri Jan 9 15:28:39 2026 +0000
Remove the Ubuntu OCI container
---
.github/labeler.yml | 1 -
Dockerfile.ubuntu | 137 ----------------------------------------------------
Makefile | 7 +--
scripts/build | 5 +-
4 files changed, 4 insertions(+), 146 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8f6e5d0..4c719db 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -32,7 +32,6 @@ containers:
- changed-files:
- any-glob-to-any-file:
- "Dockerfile.alpine"
- - "Dockerfile.ubuntu"
- "start-atr.sh"
models:
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
deleted file mode 100644
index dd917e0..0000000
--- a/Dockerfile.ubuntu
+++ /dev/null
@@ -1,137 +0,0 @@
-FROM ubuntu:24.04 AS builder
-
-ENV PIP_DEFAULT_TIMEOUT=100 \
- PIP_DISABLE_PIP_VERSION_CHECK=1 \
- PIP_NO_CACHE_DIR=1 \
- PYTHONUNBUFFERED=1 \
- UV_VERSION=0.7.12
-
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- ca-certificates \
- cmark \
- git \
- make \
- patch && \
- rm -rf /var/lib/apt/lists/*
-
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-RUN uv python install 3.13 --default
-
-# use the same workdir as in the final image
-# as the created venv will use that path
-WORKDIR /opt/atr
-
-RUN uv venv .venv --python 3.13
-ENV PATH="/opt/atr/.venv/bin:$PATH"
-
-# Copy only what we need to install dependencies
-COPY Makefile pyproject.toml uv.lock .
-
-# only install runtime dependencies
-RUN make sync
-
-# Now copy everything else
-COPY . .
-
-# generate a version.py module from git information
-RUN make generate-version
-RUN make docs
-
-WORKDIR /opt/atr/.venv/lib/python3.13/site-packages
-RUN patch -p2 < /opt/atr/patches/generics.py.patch || :
-
-# Dependency builder - install runtime system dependencies which can be copied
and run in isolation
-FROM ubuntu:24.04 AS depbuilder
-
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- curl \
- ca-certificates \
- golang && \
- rm -rf /var/lib/apt/lists/*
-
-#RUN add-apt-repository ppa:deadsnakes/ppa && apt update && \
-# apt install -y python3.13 python3.13-venv python3.13-dev
-
-# install additional tools
-
-RUN mkdir -p /opt/tools
-RUN mkdir -p /tmp/apache-rat
-WORKDIR /tmp/apache-rat
-# TODO: Check hash
-# TODO: This URL is not permanent, so we need to vendor this to pin it
-ENV RAT_VERSION=0.17
-RUN curl -L
https://dlcdn.apache.org/creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.gz
-o apache-rat.tar.gz
-RUN tar -xzf apache-rat.tar.gz
-RUN find apache-rat-${RAT_VERSION} -type f -name "*.jar" -exec cp {} . \;
-# Rename to match expected filename if needed
-RUN [ -f apache-rat-${RAT_VERSION}.jar ] || mv $(find . -maxdepth 1 -type f
-name "apache-rat*.jar" | head -1) apache-rat-${RAT_VERSION}.jar
-RUN mv apache-rat-${RAT_VERSION}.jar /opt/tools
-
-# WORKDIR /var/run
-# ENV SYFT_VERSION=1.38.2
-# RUN GOPATH=/usr/local go install
github.com/anchore/syft/cmd/syft@v${SYFT_VERSION}
-# TODO: This is much faster than the above, but we should figure out how to
pin the binaries
-RUN curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh
| sh -s -- -b /usr/local/bin
-ENV PARLAY_VERSION=0.9.0
-RUN GOPATH=/usr/local go install github.com/snyk/parlay@v${PARLAY_VERSION}
-ENV SBOMQS_VERSION=1.1.0
-RUN GOPATH=/usr/local go install
github.com/interlynk-io/sbomqs@v${SBOMQS_VERSION}
-
-ENV CDXCLI_VERSION=0.29.1
-# TODO: Check hash
-RUN curl -L
https://github.com/CycloneDX/cyclonedx-cli/releases/download/v${CDXCLI_VERSION}/cyclonedx-linux-x64
\
- -o /usr/local/bin/cyclonedx && chmod +x /usr/local/bin/cyclonedx
-
-#RUN python3.13 -m venv /usr/local/venv
-
-# final image
-FROM ubuntu:24.04
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
- PYTHONUNBUFFERED=1
-
-# Set JAVA_TOOL_OPTIONS to limit memory usage
-ENV JAVA_TOOL_OPTIONS="-XX:MaxMetaspaceSize=32m -Xmx128m -XX:+UseSerialGC
-XX:MaxRAM=256m -XX:CompressedClassSpaceSize=16m"
-
-RUN sed -i
's/htt[p|ps]:\/\/archive.ubuntu.com\/ubuntu\//mirror:\/\/mirrors.ubuntu.com\/mirrors.txt/g'
/etc/apt/sources.list
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- bash \
- curl \
- git \
- gpg \
- gpg-agent \
- openjdk-8-jdk \
- rsync \
- subversion && \
- rm -rf /var/lib/apt/lists/*
-
-COPY --from=depbuilder /usr/local/bin/syft /usr/local/bin/syft
-COPY --from=depbuilder /usr/local/bin/parlay /usr/local/bin/parlay
-COPY --from=depbuilder /usr/local/bin/sbomqs /usr/local/bin/sbomqs
-COPY --from=depbuilder /usr/local/bin/cyclonedx /usr/local/bin/cyclonedx
-COPY --from=depbuilder /opt/tools /opt/tools
-
-WORKDIR /opt/atr
-
-# copy python and app and wheels from builder
-COPY --from=builder /root/.local/share/uv /root/.local/share/uv
-COPY --from=builder /opt/atr/.venv ./.venv
-COPY --from=builder /opt/atr/atr ./atr
-COPY --from=builder /opt/atr/docs ./docs
-COPY --from=builder /opt/atr/migrations ./migrations
-COPY --from=builder /opt/atr/scripts ./scripts
-COPY --from=builder /opt/atr/Makefile .
-COPY --from=builder /opt/atr/alembic.ini .
-COPY --from=builder /opt/atr/start-atr.sh .
-
-RUN chmod +x ./start-atr.sh
-RUN java -version
-
-EXPOSE 8080
-
-WORKDIR /opt/atr
-
-CMD ["./start-atr.sh"]
diff --git a/Makefile b/Makefile
index d3c749b..b5f5ac9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
.PHONY: build build-alpine build-bootstrap build-playwright build-ts \
- build-ubuntu bump-bootstrap certs check check-extra check-light commit \
+ bump-bootstrap certs check check-extra check-light commit \
docs generate-version ipython manual run-alpine run-playwright \
run-playwright-slow serve serve-local sync sync-all update-deps
@@ -9,7 +9,7 @@ IMAGE ?= tooling-trusted-release
build: build-alpine
build-alpine:
- scripts/build Dockerfile.alpine $(IMAGE)
+ scripts/build $(IMAGE)
build-bootstrap:
docker build -t atr-bootstrap bootstrap/context
@@ -24,9 +24,6 @@ build-playwright:
build-ts:
tsgo --project ./tsconfig.json
-build-ubuntu:
- scripts/build Dockerfile.ubuntu $(IMAGE)
-
bump-bootstrap:
@test -n "$(BOOTSTRAP_VERSION)" \
|| { echo "usage: make bump-bootstrap BOOTSTRAP_VERSION=X.Y.Z"; exit
1; }
diff --git a/scripts/build b/scripts/build
index 9dd97ee..1dceba7 100755
--- a/scripts/build
+++ b/scripts/build
@@ -1,7 +1,6 @@
#!/bin/sh
set -eu
-DOCKERFILE="${1:-Dockerfile.alpine}"
-IMAGE="${2:-tooling-trusted-releases}"
+IMAGE="${1:-tooling-trusted-releases}"
-DOCKER_BUILDKIT=1 docker build -t "${IMAGE}" -f "${DOCKERFILE}" .
+DOCKER_BUILDKIT=1 docker build -t "${IMAGE}" -f Dockerfile.alpine .
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
