diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 2b39f2da0e29a..0337cdee70827 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM public.ecr.aws/docker/library/ubuntu:jammy-20230816 AS base +FROM public.ecr.aws/docker/library/ubuntu:jammy-20240911.1 AS base ENV TZ="UTC" \ DEBIAN_FRONTEND=noninteractive @@ -241,20 +241,20 @@ COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/polaris / RUN /polaris && rm /polaris ################################# -FROM base as iceberg-rest +FROM base AS iceberg-rest COPY --chown=0:0 tests/java/iceberg-rest-catalog /opt/redpanda-tests/java/iceberg-rest-catalog COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/iceberg-rest-catalog / RUN /iceberg-rest-catalog && rm /iceberg-rest-catalog ################################# -FROM base as trino +FROM base AS trino COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/trino / RUN /trino && rm /trino ################################# -FROM base as spark +FROM base AS spark COPY --chown=0:0 tests/java/spark-iceberg-dependencies /opt/redpanda-tests/java/spark-iceberg-dependencies COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/spark / RUN /spark && rm /spark diff --git a/tests/docker/ducktape-deps/client-swarm b/tests/docker/ducktape-deps/client-swarm index 71f7e5f7f138c..3f74dbba5e949 100644 --- a/tests/docker/ducktape-deps/client-swarm +++ b/tests/docker/ducktape-deps/client-swarm @@ -7,7 +7,7 @@ git clone https://github.com/redpanda-data/client-swarm.git pushd client-swarm git reset --hard 7ba96b8a78717c03392a3959a31e3c5a36cda472 -cargo build --release +cargo build --config 'term.verbose=true' --config 'net.retry=6' --release cp target/release/client-swarm /usr/local/bin popd diff --git a/tests/docker/ducktape-deps/rp-storage-tool b/tests/docker/ducktape-deps/rp-storage-tool index e4577c4b85c09..a676b8f8c13fb 100644 --- a/tests/docker/ducktape-deps/rp-storage-tool +++ b/tests/docker/ducktape-deps/rp-storage-tool @@ -3,6 +3,6 @@ set -e set -x cd /rp_storage_tool -cargo build --release +cargo build --config 'term.verbose=true' --config 'net.retry=6' --release cp target/release/rp-storage-tool /usr/local/bin cd /