From f9d6e547cafc753ea5d3b373f37f44def0da09a0 Mon Sep 17 00:00:00 2001 From: Dharmesh Khandelwal Date: Thu, 27 Dec 2018 17:36:44 +0530 Subject: [PATCH 1/3] Update Dockerfile --- Dockerfile | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b94222..4dfe92f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,3 @@ -# Copyright 2018 Paolo Smiraglia -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of -# this software and associated documentation files (the "Software"), to deal in -# the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -# of the Software, and to permit persons to whom the Software is furnished to do -# so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - FROM alpine:3.8 ENV SOFTHSM2_VERSION=2.5.0 \ From 2502c3f7f46b49252d3672920dc22c2899896c0f Mon Sep 17 00:00:00 2001 From: Dharmesh Khandelwal Date: Thu, 27 Dec 2018 17:37:03 +0530 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4dfe92f..80aad02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ WORKDIR ${SOFTHSM2_SOURCES} RUN git checkout ${SOFTHSM2_VERSION} -b ${SOFTHSM2_VERSION} \ && sh autogen.sh \ - && ./configure --prefix=/usr/local \ + && ./configure --prefix=/softhsm \ && make \ && make install From e8d23a263c77a4dcbc56fed259637d57f7acb641 Mon Sep 17 00:00:00 2001 From: Dharmesh Khandelwal Date: Thu, 27 Dec 2018 23:10:39 +0530 Subject: [PATCH 3/3] Updated base image to alpine-java 8_jdk_unlimited --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80aad02..6137005 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM anapsix/alpine-java:8_jdk_unlimited ENV SOFTHSM2_VERSION=2.5.0 \ SOFTHSM2_SOURCES=/tmp/softhsm2