Merge pull request #279 from IBM/fix/openssl-ver

Upgrade the ubiquity image to use openssl 1.0.2q instead of 1.0.2p. Also update notices file.
IBM · Dec 5, 2018 · df516f6 · df516f6
2 parents 3d199e2 + 9c2086e
commit df516f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN CGO_ENABLED=1 GOOS=linux go build -tags netgo -v -a --ldflags '-w -linkmode
 
 
 FROM alpine:3.8
-RUN apk --no-cache add ca-certificates=20171114-r3 openssl=1.0.2p-r0
+RUN apk --no-cache add ca-certificates=20171114-r3 openssl=1.0.2q-r0
 WORKDIR /root/
 COPY --from=0 /go/src/github.com/IBM/ubiquity/ubiquity .
 COPY --from=0 /go/src/github.com/IBM/ubiquity/LICENSE .

diff --git a/scripts/notices_file_for_ibm_storage_enabler_for_containers b/scripts/notices_file_for_ibm_storage_enabler_for_containers
@@ -8707,8 +8707,8 @@ INFORMATION
 
 @@@@@@@@@@@@
 ===========================================================================
-OpenSSL version 1.0.2p: The Program includes OpenSSL version 1.0.2p
-software. IBM obtained the OpenSSL version 1.0.2p software under the
+OpenSSL version 1.0.2q: The Program includes OpenSSL version 1.0.2q
+software. IBM obtained the OpenSSL version 1.0.2q software under the
 terms and conditions of the following license(s):
 
 ---------------------------------------------------------------------------
@@ -9229,7 +9229,7 @@ Copyright (c) 2004 Kungliga Tekniska Högskolan
 
 
 =======================================================================
-END OF OpenSSL version 1.0.2p NOTICES AND INFORMATION 
+END OF OpenSSL version 1.0.2q NOTICES AND INFORMATION 
 =======================================================================