Skip to content

Commit 10d4cf3

Browse files
author
Yihao
authored
Fix JDK installation on Ubuntu (#54)
* Bump jdk version * Install python 2 explicitly
1 parent ceba7a9 commit 10d4cf3

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ubuntu.18.04/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG Ecs_Cli_Version=1.20.0
1010
ARG Eks_Cli_Version=0.25.0
1111
ARG Google_Cloud_Cli_Version=339.0.0-0
1212
ARG Helm_Version=v3.7.1
13-
ARG Java_Jdk_Version=11.0.15+10-0ubuntu0.18.04.1
13+
ARG Java_Jdk_Version=11.0.17+8-1ubuntu2~18.04
1414
ARG Kubectl_Version=1.18.8-00
1515
ARG Octopus_Cli_Version=7.4.1
1616
ARG Octopus_Client_Version=8.8.3
@@ -66,6 +66,7 @@ RUN DOTNET_CLI_TELEMETRY_OPTOUT=1 && \
6666

6767
# Get JDK
6868
# https://www.digitalocean.com/community/tutorials/how-to-install-java-with-apt-on-ubuntu-18-04
69+
# https://packages.ubuntu.com/bionic/openjdk-11-dbg
6970
RUN apt-get install -y openjdk-11-jdk-headless=${Java_Jdk_Version}
7071

7172
# Install common Java tools
@@ -102,9 +103,12 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
102103
wget -q -O - https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
103104
apt-get update && apt-get install -y google-cloud-sdk=${Google_Cloud_Cli_Version}
104105

105-
# Get python & groff
106+
# Get python3 & groff
106107
RUN apt-get install -y python3-pip groff
107108

109+
# Install python2
110+
RUN apt-get install -y python-minimal
111+
108112
# Get AWS CLI
109113
# https://docs.aws.amazon.com/cli/latest/userguide/install-linux.html#install-linux-awscli
110114
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${Aws_Cli_Version}.zip" -o "awscliv2.zip" && \

ubuntu.18.04/spec/ubuntu.18.04.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Describe 'installed dependencies' {
1818
}
1919

2020
It 'has java installed' {
21-
java --version | Should -beLike "*11.0.15*"
21+
java --version | Should -beLike "*11.0.17*"
2222
$LASTEXITCODE | Should -be 0
2323
}
2424

0 commit comments

Comments
 (0)