diff --git a/ci/images/ci-image-jdk19/Dockerfile b/ci/images/ci-image-jdk19/Dockerfile index 7924a2b6ae..9b84d796fd 100644 --- a/ci/images/ci-image-jdk19/Dockerfile +++ b/ci/images/ci-image-jdk19/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:jammy-20230301 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh ADD get-docker-url.sh /get-docker-url.sh +ADD get-docker-compose-url.sh /get-docker-compose-url.sh RUN ./setup.sh java17 java19 ENV JAVA_HOME /opt/openjdk diff --git a/ci/images/ci-image-jdk20/Dockerfile b/ci/images/ci-image-jdk20/Dockerfile index c3491a1476..476b635431 100644 --- a/ci/images/ci-image-jdk20/Dockerfile +++ b/ci/images/ci-image-jdk20/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:jammy-20230126 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh ADD get-docker-url.sh /get-docker-url.sh +ADD get-docker-compose-url.sh /get-docker-compose-url.sh RUN ./setup.sh java17 java20 ENV JAVA_HOME /opt/openjdk diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index cdea0ff80c..7848c06424 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:jammy-20230301 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh ADD get-docker-url.sh /get-docker-url.sh +ADD get-docker-compose-url.sh /get-docker-compose-url.sh RUN ./setup.sh java17 ENV JAVA_HOME /opt/openjdk diff --git a/ci/images/get-docker-compose-url.sh b/ci/images/get-docker-compose-url.sh new file mode 100755 index 0000000000..bcabee3d54 --- /dev/null +++ b/ci/images/get-docker-compose-url.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e + +version="2.17.0" +echo "https://github.com/docker/compose/releases/download/v$version/docker-compose-linux-x86_64" diff --git a/ci/images/setup.sh b/ci/images/setup.sh index 7cc0c6744d..48df23b707 100755 --- a/ci/images/setup.sh +++ b/ci/images/setup.sh @@ -52,6 +52,14 @@ chmod +x entrykit && \ mv entrykit /bin/entrykit && \ entrykit --symlink +########################################################### +# DOCKER COMPOSE +########################################################### +mkdir -p /usr/local/lib/docker/cli-plugins +DOCKER_COMPOSE_URL=$( ./get-docker-compose-url.sh ) +curl -L ${DOCKER_COMPOSE_URL} -o /usr/local/lib/docker/cli-plugins/docker-compose +chmod +x /usr/local/lib/docker/cli-plugins/docker-compose + ########################################################### # GRADLE ENTERPRISE ###########################################################