dlab-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omartushevs...@apache.org
Subject [incubator-dlab] branch DLAB-1158 updated: added step-ca certificates;
Date Thu, 14 Nov 2019 10:53:32 GMT
This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1158 by this push:
     new 02cd171  added step-ca certificates;
02cd171 is described below

commit 02cd17127b9434d74383903b39aee7cf2d7d3069
Author: Oleh Martushevskyi <Oleh_Martushevskyi@epam.com>
AuthorDate: Thu Nov 14 12:53:18 2019 +0200

    added step-ca certificates;
---
 .../self-service/{Dockerfile_aws => Dockerfile}    |  6 ++--
 services/self-service/Dockerfile_gcp               | 41 ----------------------
 .../{entrypoint_gcp.sh => entrypoint.sh}           |  0
 services/self-service/entrypoint_aws.sh            | 35 ------------------
 4 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/services/self-service/Dockerfile_aws b/services/self-service/Dockerfile
similarity index 93%
rename from services/self-service/Dockerfile_aws
rename to services/self-service/Dockerfile
index df4b523..9002cfb 100644
--- a/services/self-service/Dockerfile_aws
+++ b/services/self-service/Dockerfile
@@ -35,7 +35,7 @@ RUN apk add --update \
     && rm -rf /var/cache/apk/*
 
 COPY self-service-2.1.jar /root/
-COPY entrypoint_aws.sh /
-RUN chmod 755 /entrypoint_aws.sh
+COPY entrypoint.sh /
+RUN chmod 755 /entrypoint.sh
 
-ENTRYPOINT ["/entrypoint_aws.sh"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/services/self-service/Dockerfile_gcp b/services/self-service/Dockerfile_gcp
deleted file mode 100644
index 5f5b521..0000000
--- a/services/self-service/Dockerfile_gcp
+++ /dev/null
@@ -1,41 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-FROM openjdk:8-alpine
-
-
-USER root
-
-RUN apk add --update \
-    python \
-    python-dev \
-    py-pip \
-    openssl \
-    build-base \
-    && pip install awscli --upgrade \
-    && apk --purge -v del py-pip \
-    && rm -rf /var/cache/apk/*
-
-COPY self-service-2.1.jar /root/
-COPY entrypoint_aws.sh /
-RUN chmod 755 /entrypoint_aws.sh
-
-ENTRYPOINT ["/entrypoint_aws.sh"]
diff --git a/services/self-service/entrypoint_gcp.sh b/services/self-service/entrypoint.sh
similarity index 100%
rename from services/self-service/entrypoint_gcp.sh
rename to services/self-service/entrypoint.sh
diff --git a/services/self-service/entrypoint_aws.sh b/services/self-service/entrypoint_aws.sh
deleted file mode 100644
index 9315d8c..0000000
--- a/services/self-service/entrypoint_aws.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-checkfile () {
-if [ -s /root/step-certs/ca.crt ]
-then
-  RUN="true"
-else
-  RUN="false"
-  sleep 5
-fi
-}
-
-/bin/mkdir -p /root/keys
-
-if [ -d "/root/step-certs" ]; then
-  while checkfile
-  do
-    if [ "$RUN" = "false" ];
-    then
-        echo "Waiting..."
-    else
-        echo "CA exist!"
-        break
-    fi
-  done
-  /usr/bin/keytool -importcert -trustcacerts -alias step-ca -file /root/step-certs/ca.crt
-noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
-  /usr/bin/keytool -importcert -trustcacerts -alias step-crt -file /root/step-certs/tls.crt
-noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
-fi
-
-
-
-/usr/bin/openssl pkcs12 -export -in /root/step-certs/tls.crt -inkey /root/step-certs/tls.key
-name ssn -out ssn.p12 -password pass:${SSN_KEYSTORE_PASSWORD}
-/usr/bin/keytool -importkeystore -srckeystore ssn.p12 -srcstoretype PKCS12 -alias ssn -destkeystore
/root/keys/ssn.keystore.jks -deststorepass "${SSN_KEYSTORE_PASSWORD}" -srcstorepass "${SSN_KEYSTORE_PASSWORD}"
-/usr/bin/keytool -keystore /root/keys/ssn.keystore.jks -alias CARoot -import -file /root/step-certs/ca.crt
 -deststorepass "${SSN_KEYSTORE_PASSWORD}" -srcstorepass "${SSN_KEYSTORE_PASSWORD}" -noprompt
-/usr/bin/java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 -DDLAB_CONF_DIR=/root/
/root/self-service-2.1.jar server /root/self-service.yml
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


Mime
View raw message