Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
- Updated all java-base images to stackable0.2.2 ([#250]).
- Updated all ubi8 base images to latest (8.6-994) ([#250]).
- Updated all internal images to rebuild their base images on demand ([#321]).
- Unpinned testing-tools dependencies ([#326]).

### Removed

Expand All @@ -28,3 +29,4 @@ All notable changes to this project will be documented in this file.
[#250]: https://github.com/stackabletech/docker-images/pull/250
[#321]: https://github.com/stackabletech/docker-images/pull/321
[#325]: https://github.com/stackabletech/docker-images/pull/325
[#326]: https://github.com/stackabletech/docker-images/pull/326
9 changes: 4 additions & 5 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,10 @@
},
],
},
# Build is broken
# {
# 'name': 'testing-tools',
# 'versions': [{'product': '0.1.0'}],
# },
{
'name': 'testing-tools',
'versions': [{'product': '0.1.0'}],
},
{
# ZooKeeper must be at least 3.5.0
'name': 'zookeeper',
Expand Down
38 changes: 19 additions & 19 deletions testing-tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim@sha256:13b98a4ddf43c98e3f91bd5136844ff0b0c1d2a4c913b4a430d552a43d4c7b3b AS builder
FROM python:3.10-slim-bullseye@sha256:13b98a4ddf43c98e3f91bd5136844ff0b0c1d2a4c913b4a430d552a43d4c7b3b AS builder

ARG PRODUCT
ARG RELEASE
Expand All @@ -16,24 +16,24 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN apt-get update && \
apt-get install -y --no-install-recommends \
build-essential=12.9 \
ca-certificates=20210119 \
curl=7.74.0-1.3+deb11u2 \
gzip=1.10-4+deb11u1 \
jq=1.6-2.1 \
libssl-dev=1.1.1n-0+deb11u3 \
libxml2-dev=2.9.10+dfsg-6.7+deb11u2 \
libxslt1-dev=1.1.34-4 \
pkg-config=0.29.2-1 \
python3-certifi=2020.6.20-1 \
python3-idna=2.10-1 \
python3-requests=2.25.1+dfsg-2 \
python3-semver=2.10.2-2 \
python3-thrift=0.13.0-6 \
python3-toml=0.10.1-1 \
python3-urllib3=1.26.5-1~exp1 \
tar=1.34+dfsg-1 \
zip=3.0-12 && \
build-essential \
ca-certificates \
curl \
gzip \
jq \
libssl-dev \
libxml2-dev \
libxslt1-dev \
pkg-config \
python3-certifi \
python3-idna \
python3-requests \
python3-semver \
python3-thrift \
python3-toml \
python3-urllib3 \
tar \
zip && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down