Skip to content

Commit 91c5d41

Browse files
committed
Add docker compose to CI images
Closes gh-34738
1 parent 5348e24 commit 91c5d41

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

ci/images/ci-image-jdk19/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:jammy-20230301
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
ADD get-docker-url.sh /get-docker-url.sh
6+
ADD get-docker-compose-url.sh /get-docker-compose-url.sh
67
RUN ./setup.sh java17 java19
78

89
ENV JAVA_HOME /opt/openjdk

ci/images/ci-image-jdk20/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:jammy-20230126
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
ADD get-docker-url.sh /get-docker-url.sh
6+
ADD get-docker-compose-url.sh /get-docker-compose-url.sh
67
RUN ./setup.sh java17 java20
78

89
ENV JAVA_HOME /opt/openjdk

ci/images/ci-image/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:jammy-20230301
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
ADD get-docker-url.sh /get-docker-url.sh
6+
ADD get-docker-compose-url.sh /get-docker-compose-url.sh
67
RUN ./setup.sh java17
78

89
ENV JAVA_HOME /opt/openjdk

ci/images/get-docker-compose-url.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -e
3+
4+
version="2.17.0"
5+
echo "https://github.com/docker/compose/releases/download/v$version/docker-compose-linux-x86_64"

ci/images/setup.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ chmod +x entrykit && \
5252
mv entrykit /bin/entrykit && \
5353
entrykit --symlink
5454

55+
###########################################################
56+
# DOCKER COMPOSE
57+
###########################################################
58+
mkdir -p /usr/local/lib/docker/cli-plugins
59+
DOCKER_COMPOSE_URL=$( ./get-docker-compose-url.sh )
60+
curl -L ${DOCKER_COMPOSE_URL} -o /usr/local/lib/docker/cli-plugins/docker-compose
61+
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
62+
5563
###########################################################
5664
# GRADLE ENTERPRISE
5765
###########################################################

0 commit comments

Comments
 (0)