Skip to content

THRIFT-5000: Use per-version Docker build contexts #3582

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
kpumuk merged 1 commit into from
Jun 3, 2026
Merged

THRIFT-5000: Use per-version Docker build contexts #3582

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
4 changes: 2 additions & 2 deletions docker/0.22.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*

COPY --from=builder /opt/thrift/bin/thrift /usr/local/bin/thrift
COPY ../docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
COPY ../tests/smoke.thrift /tmp/smoke.thrift
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN set -eux; \
thrift --version | grep -F "$THRIFT_VERSION"; \
echo 'struct Ping { 1: string message }' > /tmp/smoke.thrift; \
mkdir -p /tmp/smoke-out; \
thrift --gen json -o /tmp/smoke-out /tmp/smoke.thrift; \
find /tmp/smoke-out -type f | grep -q .; \
Expand Down
4 changes: 2 additions & 2 deletions docker/0.22.0/Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ RUN set -eux; \
apk add --no-cache libstdc++

COPY --from=builder /opt/thrift/bin/thrift /usr/local/bin/thrift
COPY ../docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
COPY ../tests/smoke.thrift /tmp/smoke.thrift
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN set -eux; \
thrift --version | grep -F "$THRIFT_VERSION"; \
echo 'struct Ping { 1: string message }' > /tmp/smoke.thrift; \
mkdir -p /tmp/smoke-out; \
thrift --gen json -o /tmp/smoke-out /tmp/smoke.thrift; \
find /tmp/smoke-out -type f | grep -q .; \
Expand Down
10 changes: 10 additions & 0 deletions docker/0.22.0/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
set -e

if [ "$#" -eq 0 ]; then
set -- thrift
elif [ "${1#-}" != "$1" ]; then
set -- thrift "$@"
fi

exec "$@"
4 changes: 2 additions & 2 deletions docker/0.23.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*

COPY --from=builder /opt/thrift/bin/thrift /usr/local/bin/thrift
COPY ../docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
COPY ../tests/smoke.thrift /tmp/smoke.thrift
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN set -eux; \
thrift --version | grep -F "$THRIFT_VERSION"; \
echo 'struct Ping { 1: string message }' > /tmp/smoke.thrift; \
mkdir -p /tmp/smoke-out; \
thrift --gen json -o /tmp/smoke-out /tmp/smoke.thrift; \
find /tmp/smoke-out -type f | grep -q .; \
Expand Down
4 changes: 2 additions & 2 deletions docker/0.23.0/Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ RUN set -eux; \
apk add --no-cache libstdc++

COPY --from=builder /opt/thrift/bin/thrift /usr/local/bin/thrift
COPY ../docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
COPY ../tests/smoke.thrift /tmp/smoke.thrift
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN set -eux; \
thrift --version | grep -F "$THRIFT_VERSION"; \
echo 'struct Ping { 1: string message }' > /tmp/smoke.thrift; \
mkdir -p /tmp/smoke-out; \
thrift --gen json -o /tmp/smoke-out /tmp/smoke.thrift; \
find /tmp/smoke-out -type f | grep -q .; \
Expand Down
10 changes: 10 additions & 0 deletions docker/0.23.0/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
set -e

if [ "$#" -eq 0 ]; then
set -- thrift
elif [ "${1#-}" != "$1" ]; then
set -- thrift "$@"
fi

exec "$@"
8 changes: 4 additions & 4 deletions docker/generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ for version, meta in maintained:
print(f"Tags: {', '.join(debian_tags)}")
print("Architectures: amd64, arm64v8")
print(f"GitCommit: {git_commit}")
print("Directory: docker")
print(f"File: {version}/Dockerfile")
print(f"Directory: docker/{version}")
print("File: Dockerfile")
print()

alpine_tags = [f"{version}-alpine{alpine}"]
Expand All @@ -86,8 +86,8 @@ for version, meta in maintained:
print(f"Tags: {', '.join(alpine_tags)}")
print("Architectures: amd64, arm64v8")
print(f"GitCommit: {git_commit}")
print("Directory: docker")
print(f"File: {version}/Dockerfile.alpine")
print(f"Directory: docker/{version}")
print("File: Dockerfile.alpine")
if version != maintained[-1][0]:
print()
PY
8 changes: 5 additions & 3 deletions docker/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,18 @@ for version in $(maintained_versions); do
for variant in debian alpine; do
case "$variant" in
debian)
dockerfile="$version/Dockerfile"
context="$version"
dockerfile="Dockerfile"
;;
alpine)
dockerfile="$version/Dockerfile.alpine"
context="$version"
dockerfile="Dockerfile.alpine"
;;
esac

image="$(image_tag "$version" "$variant" "$platform")"
echo "Building $image for $platform"
docker buildx build --platform "$platform" --load -t "$image" -f "$dockerfile" .
docker buildx build --platform "$platform" --load -t "$image" -f "$context/$dockerfile" "$context"
echo "Testing $image for $platform"
smoke_image "$image" "$platform" "$version" "$variant"
done
Expand Down
Loading