diff --git a/CHANGELOG.md b/CHANGELOG.md index 9924cb0..4c3070f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 1.3.5 - 2018-03-20 +### Fixed +- Interacting with an SSL protected Maven Repository Manager broke with Concourse 3.9.0. The way Concourse now mounts the worker's certificate directory to `/etc/ssl/certs` clobbers the `/etc/ssl/certs/java/cacerts` file placed there by the base [openjdk](https://hub.docker.com/_/openjdk/) image, which is symlinked to at `$JAVA_HOME/jre/lib/security/cacerts`, which of course is needed by Java for SSL stuff. + + So... as a workaround we unlink the link and copy the file directly to `$JAVA_HOME/jre/lib/security/cacerts`. Thx to [@elgohr](https://github.com/elgohr) for working with me on this! + +### Changed +- Bumped base [openjdk](https://hub.docker.com/_/openjdk/) image to version `8u151` (from `8u131`). + ## 1.3.4 - 2017-10-03 ### Fixed - v1.3.3 introduced [Incorrect SNAPSHOT version checking logic](https://github.com/patrickcrocker/maven-resource/issues/12) for the `check` operation for snapshots but was quickly spotted by [@shinmyung0](https://github.com/shinmyung0). This is now fixed and the 1.3.3 release has been yanked! diff --git a/Dockerfile b/Dockerfile index 630bcc8..d5e4dcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,11 @@ -FROM openjdk:8u131-jdk-alpine +FROM openjdk:8u151-jdk-alpine RUN apk add --no-cache curl tar bash jq libxml2-utils +# https://github.com/concourse/concourse/issues/2042 +RUN unlink $JAVA_HOME/jre/lib/security/cacerts && \ + cp /etc/ssl/certs/java/cacerts $JAVA_HOME/jre/lib/security/cacerts + ADD assets/ /opt/resource/ ADD test/ /opt/resource/test/ ADD itest/ /opt/resource/itest/ diff --git a/debian/Dockerfile b/debian/Dockerfile index 80bfead..08e7f44 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,9 +1,13 @@ -FROM openjdk:8u131-jdk +FROM openjdk:8u151-jdk RUN apt-get update && apt-get -y install jq libxml2-utils \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# https://github.com/concourse/concourse/issues/2042 +RUN unlink $JAVA_HOME/jre/lib/security/cacerts && \ + cp /etc/ssl/certs/java/cacerts $JAVA_HOME/jre/lib/security/cacerts + ADD assets/ /opt/resource/ ADD test/ /opt/resource/test/ ADD itest/ /opt/resource/itest/