You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/06/24 14:50:28 UTC
[incubator-dlab] branch develop updated: [develop]: changed
dlab-version in jar files
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 28e8774 [develop]: changed dlab-version in jar files
28e8774 is described below
commit 28e87743b8e00e3ca4dbd70cba4fa63725a32778
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jun 24 17:50:08 2020 +0300
[develop]: changed dlab-version in jar files
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 8 ++++----
services/billing-aws/Dockerfile | 4 ++--
services/billing-azure/Dockerfile | 4 ++--
services/billing-gcp/Dockerfile | 4 ++--
services/self-service/Dockerfile | 2 +-
services/self-service/entrypoint.sh | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index f09731c..fb05691 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -572,17 +572,17 @@ def ensure_jar_endpoint():
conn.run('mkdir -p {}'.format(web_path))
conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/provisioning-service-'
- '2.2.jar --no-check-certificate'
+ '2.4.jar --no-check-certificate'
.format(web_path, args.repository_user,
args.repository_pass, args.repository_address))
- conn.run('mv {0}/provisioning-service-2.2.jar {0}/provisioning-service.jar'
+ conn.run('mv {0}/provisioning-service-2.4.jar {0}/provisioning-service.jar'
.format(web_path))
conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/billing-{}-'
- '2.2.jar --no-check-certificate'
+ '2.4.jar --no-check-certificate'
.format(web_path, args.repository_user,
args.repository_pass, args.repository_address, args.cloud_provider))
- conn.run('mv {0}/billing-{1}-2.2.jar {0}/billing.jar'
+ conn.run('mv {0}/billing-{1}-2.4.jar {0}/billing.jar'
.format(web_path, args.cloud_provider))
conn.sudo('touch {}'.format(ensure_file))
except Exception as err:
diff --git a/services/billing-aws/Dockerfile b/services/billing-aws/Dockerfile
index b41a919..ed8e55e 100644
--- a/services/billing-aws/Dockerfile
+++ b/services/billing-aws/Dockerfile
@@ -23,6 +23,6 @@ FROM openjdk:8-alpine
USER root
-COPY billing-aws-2.2.jar /root/
+COPY billing-aws-2.4.jar /root/
-CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-aws-2.2.jar --conf /root/billing.yml
\ No newline at end of file
+CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-aws-2.4.jar --conf /root/billing.yml
\ No newline at end of file
diff --git a/services/billing-azure/Dockerfile b/services/billing-azure/Dockerfile
index dc19faf..975b251 100644
--- a/services/billing-azure/Dockerfile
+++ b/services/billing-azure/Dockerfile
@@ -23,6 +23,6 @@ FROM openjdk:8-alpine
USER root
-COPY billing-azure-2.2.jar /root/
+COPY billing-azure-2.4.jar /root/
-CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-azure-2.2.jar --conf /root/billing.yml
\ No newline at end of file
+CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-azure-2.4.jar --conf /root/billing.yml
\ No newline at end of file
diff --git a/services/billing-gcp/Dockerfile b/services/billing-gcp/Dockerfile
index c4e6733..97e93c8 100644
--- a/services/billing-gcp/Dockerfile
+++ b/services/billing-gcp/Dockerfile
@@ -23,6 +23,6 @@ FROM openjdk:8-alpine
USER root
-COPY billing-gcp-2.2.jar /root/
+COPY billing-gcp-2.4.jar /root/
-CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-gcp-2.2.jar --spring.config.location=/root/billing.yml
\ No newline at end of file
+CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-gcp-2.4.jar --spring.config.location=/root/billing.yml
\ No newline at end of file
diff --git a/services/self-service/Dockerfile b/services/self-service/Dockerfile
index bb2a7b7..6275ba0 100644
--- a/services/self-service/Dockerfile
+++ b/services/self-service/Dockerfile
@@ -34,7 +34,7 @@ RUN apk add --update \
&& apk --purge -v del py-pip \
&& rm -rf /var/cache/apk/*
-COPY self-service-2.2.jar /root/
+COPY self-service-2.4.jar /root/
COPY entrypoint.sh /
RUN chmod 755 /entrypoint.sh
diff --git a/services/self-service/entrypoint.sh b/services/self-service/entrypoint.sh
index 8c2f732..ba2d35e 100644
--- a/services/self-service/entrypoint.sh
+++ b/services/self-service/entrypoint.sh
@@ -32,4 +32,4 @@ 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 step-ca -import -file /root/step-certs/ca.crt -deststorepass "${SSN_KEYSTORE_PASSWORD}" -srcstorepass "${SSN_KEYSTORE_PASSWORD}" -noprompt
-/usr/bin/java -Xmx2048M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 -DDLAB_CONF_DIR=/root/ /root/self-service-2.2.jar server /root/self-service.yml
\ No newline at end of file
+/usr/bin/java -Xmx2048M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 -DDLAB_CONF_DIR=/root/ /root/self-service-2.4.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