build(corda-all-in-one-obligation): fix openssh unable to select pack…

…ages WORK IN PROGRESS - Image build is broken still Fixes hyperledger-cacti#2621 Signed-off-by: Peter Somogyvari <[email protected]>
petermetz · Aug 17, 2023 · 53ad63a · 53ad63a
1 parent ca1b3be
commit 53ad63a
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile b/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile
@@ -1,8 +1,8 @@
-FROM docker:24.0.2-dind
+FROM docker:24.0.5-dind
 
 # cordaVersion=4.8.5
 # cordaCoreVersion=4.8.5
-ARG SAMPLES_KOTLIN_SHA=1504878ce446555bd861bbe4dd3d1154e905a07f
+ARG SAMPLES_KOTLIN_SHA=8ce33f57ad1dd77f721af4d1f59d72f3d331fd0c
 ARG SAMPLES_KOTLIN_CORDAPP_SUB_DIR_PATH="./Advanced/obligation-cordapp/"
 ARG CORDA_TOOLS_SHELL_CLI_VERSION=4.8
 
@@ -11,7 +11,7 @@ WORKDIR /
 RUN apk update
 
 # Install dependencies of Docker Compose
-RUN apk add py-pip python3-dev libffi-dev openssl-dev gcc libc-dev make
+RUN apk add docker-cli docker-cli-compose
 
 # Install git so we can check out the kotlin-samples repo of Corda
 RUN apk add --no-cache git
@@ -25,16 +25,22 @@ RUN apk add --no-cache curl
 # The file binary is used to inspect exectubles when debugging container image issues
 RUN apk add --no-cache file
 
-RUN apk add --no-cache openjdk8
+RUN apk add --no-cache openjdk11
 
 # Need gradle to execute the corda sample app setup commands
 RUN apk add --no-cache gradle
 
+RUN gradle --version
+
 ENV CACTUS_CFG_PATH=/etc/hyperledger/cactus
 RUN mkdir -p $CACTUS_CFG_PATH
 
+# Need to install augtool for manipulating the SSH configuration files below
+RUN apk add --no-cache augeas
+
 # OpenSSH - need to have it so we can shell in and install/instantiate contracts and troubleshoot
-RUN apk add --no-cache openssh augeas
+RUN apk update && apk --no-cache upgrade openssh-client
+
 
 # Configure the OpenSSH server we just installed
 RUN augtool 'set /files/etc/ssh/sshd_config/AuthorizedKeysFile ".ssh/authorized_keys /etc/authorized_keys/%u"'