mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Max KainovandClaude Opus 4.8
77973364a7
The mirror override was only applied to a subset of images. Every other arm64 CI image built directly `FROM ubuntu` still resolved through `ports.ubuntu.com` and was subject to the same failure. Add a generic `build_args` field to `Docker.Config` and pass the in-region AWS mirror (`apt_archive` / `apt_ports_archive`, set literally in `ci/defs/defs.py`) to the Ubuntu-based CI images on the command line. `ci/praktika/docker.py` stays generic - it just forwards `build_args` and knows nothing about apt or the region. Images that don't declare the args ignore them. Dockerfile defaults stay canonical so local builds are unchanged, and the remaining direct-`ubuntu` arm64 images (`style-test`, `install-deb-test`, `sqlancer-test`, `mysql_dotnet_client`, `postgresql-java-client`) get a `ports`- and deb822-aware rewrite so the passed mirror reaches arm64. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
30 lines
1.3 KiB
Docker
30 lines
1.3 KiB
Docker
# docker build -t clickhouse/postgresql-java-client .
|
|
# PostgreSQL Java client docker container
|
|
# Rebuild to enable SBOM/provenance attestations (see #97903, #98511)
|
|
|
|
FROM ubuntu:24.04
|
|
|
|
# Redirect apt to the mirror passed by CI (canonical default; see ci/praktika/docker.py).
|
|
# Rewrite archive.ubuntu.com (amd64) and ports.ubuntu.com (arm64) across sources.list
|
|
# and deb822 *.sources so arm64 builds avoid the flaky ports.ubuntu.com.
|
|
ARG apt_archive="http://archive.ubuntu.com"
|
|
ARG apt_ports_archive="http://ports.ubuntu.com"
|
|
RUN find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) -print0 | xargs -0 -r sed -i \
|
|
-e "s|http://archive.ubuntu.com|$apt_archive|g" \
|
|
-e "s|https://archive.ubuntu.com|$apt_archive|g" \
|
|
-e "s|http://ports.ubuntu.com|$apt_ports_archive|g" \
|
|
-e "s|https://ports.ubuntu.com|$apt_ports_archive|g"
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends openjdk-21-jdk curl \
|
|
&& apt-get clean \
|
|
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
|
|
|
|
ARG ver=42.7.7
|
|
RUN curl -L -o /postgresql-java-${ver}.jar https://repo1.maven.org/maven2/org/postgresql/postgresql/${ver}/postgresql-${ver}.jar
|
|
ENV CLASSPATH=.:/postgresql-java-${ver}.jar
|
|
|
|
WORKDIR /jdbc
|
|
COPY Test.java Test.java
|
|
RUN javac Test.java
|