This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-408
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-408 by this push:
new ca5f751 [DATALAB-408]: changed COPY paths for ssn docker images
ca5f751 is described below
commit ca5f751cc821d8e032cbd13e365cfc59817aac6c
Author: leonidfrolov <[email protected]>
AuthorDate: Wed Aug 4 16:46:41 2021 +0300
[DATALAB-408]: changed COPY paths for ssn docker images
---
infrastructure-provisioning/scripts/deploy_datalab.py | 4 ++--
.../src/general/files/aws/ssn_Dockerfile | 16 ++++++++--------
.../src/general/files/azure/ssn_Dockerfile | 14 +++++++-------
.../src/general/files/gcp/ssn_Dockerfile | 18 +++++++++---------
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py
b/infrastructure-provisioning/scripts/deploy_datalab.py
index f1442de..7414b49 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -217,10 +217,10 @@ def build_docker_images(args):
subprocess.run('sudo docker image rm
{}:8083/docker.datalab-ssn-{}'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
else:
# Building base and ssn docker images
- subprocess.run('cd {2}; sudo docker build --build-arg OS={0}
--build-arg SRC_PATH="infrastructure-provisioning/src/" --file '
+ subprocess.run('cd {2}/infrastructure-provisioning/src; sudo docker
build --build-arg OS={0} --build-arg
SRC_PATH="infrastructure-provisioning/src/" --file '
'infrastructure-provisioning/src/general/files/{1}/'
'base_Dockerfile -t docker.datalab-base
.'.format(args.conf_os_family, args.conf_cloud_provider, args.workspace_path),
shell=True, check=True)
- subprocess.run('cd {2}; sudo docker build --build-arg OS={0} --file
infrastructure-provisioning/src/general/files/{1}/'
+ subprocess.run('cd {2}/infrastructure-provisioning/src; sudo docker
build --build-arg OS={0} --file
infrastructure-provisioning/src/general/files/{1}/'
'ssn_Dockerfile -t docker.datalab-ssn
.'.format(args.conf_os_family, args.conf_cloud_provider, args.workspace_path),
shell=True, check=True)
diff --git a/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile
b/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile
index b9c1548..0a8ea5e 100644
--- a/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile
@@ -23,14 +23,14 @@ FROM docker.datalab-base:latest
ARG OS
-COPY infrastructure-provisioning/src/ssn/ /root/
-COPY infrastructure-provisioning/src/general/scripts/aws/ssn_* /root/scripts/
-COPY infrastructure-provisioning/src/general/lib/os/${OS}/ssn_lib.py
/usr/lib/python3.8/datalab/ssn_lib.py
-COPY infrastructure-provisioning/src/general/files/aws/ssn_policy.json
/root/files/
-COPY infrastructure-provisioning/src/general/templates/aws/jenkins_jobs
/root/templates/jenkins_jobs
-COPY infrastructure-provisioning/src/general/templates/os/manage_step_certs.sh
/root/templates/
-COPY
infrastructure-provisioning/src/general/templates/os/step-cert-manager.service
/root/templates/
-COPY
infrastructure-provisioning/src/general/templates/os/renew_certificates.sh
/root/templates/
+COPY ssn/ /root/
+COPY general/scripts/aws/ssn_* /root/scripts/
+COPY general/lib/os/${OS}/ssn_lib.py /usr/lib/python3.8/datalab/ssn_lib.py
+COPY general/files/aws/ssn_policy.json /root/files/
+COPY general/templates/aws/jenkins_jobs /root/templates/jenkins_jobs
+COPY general/templates/os/manage_step_certs.sh /root/templates/
+COPY general/templates/os/step-cert-manager.service /root/templates/
+COPY general/templates/os/renew_certificates.sh /root/templates/
RUN chmod a+x /root/fabfile.py; \
chmod a+x /root/scripts/*
diff --git a/infrastructure-provisioning/src/general/files/azure/ssn_Dockerfile
b/infrastructure-provisioning/src/general/files/azure/ssn_Dockerfile
index 8eb5885..b248171 100644
--- a/infrastructure-provisioning/src/general/files/azure/ssn_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/azure/ssn_Dockerfile
@@ -23,13 +23,13 @@ FROM docker.datalab-base:latest
ARG OS
-COPY infrastructure-provisioning/src/ssn/ /root/
-COPY infrastructure-provisioning/src/general/scripts/azure/ssn_* /root/scripts/
-COPY infrastructure-provisioning/src/general/lib/os/${OS}/ssn_lib.py
/usr/lib/python3.8/datalab/ssn_lib.py
-COPY infrastructure-provisioning/src/general/templates/azure/jenkins_jobs
/root/templates/jenkins_jobs
-COPY infrastructure-provisioning/src/general/templates/os/manage_step_certs.sh
/root/templates/
-COPY
infrastructure-provisioning/src/general/templates/os/step-cert-manager.service
/root/templates/
-COPY
infrastructure-provisioning/src/general/templates/os/renew_certificates.sh
/root/templates/
+COPY ssn/ /root/
+COPY general/scripts/azure/ssn_* /root/scripts/
+COPY general/lib/os/${OS}/ssn_lib.py /usr/lib/python3.8/datalab/ssn_lib.py
+COPY general/templates/azure/jenkins_jobs /root/templates/jenkins_jobs
+COPY general/templates/os/manage_step_certs.sh /root/templates/
+COPY general/templates/os/step-cert-manager.service /root/templates/
+COPY general/templates/os/renew_certificates.sh /root/templates/
RUN chmod a+x /root/fabfile.py; \
chmod a+x /root/scripts/*
diff --git a/infrastructure-provisioning/src/general/files/gcp/ssn_Dockerfile
b/infrastructure-provisioning/src/general/files/gcp/ssn_Dockerfile
index a330912..db28dcd 100644
--- a/infrastructure-provisioning/src/general/files/gcp/ssn_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/ssn_Dockerfile
@@ -23,15 +23,15 @@ FROM docker.datalab-base:latest
ARG OS
-COPY infrastructure-provisioning/src/ssn/ /root/
-COPY infrastructure-provisioning/src/general/scripts/gcp/ssn_* /root/scripts/
-COPY infrastructure-provisioning/src/general/lib/os/${OS}/ssn_lib.py
/usr/lib/python3.8/datalab/ssn_lib.py
-COPY infrastructure-provisioning/src/general/files/gcp/ssn_policy.json
/root/files/
-COPY infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
/root/files/
-COPY infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs
/root/templates/jenkins_jobs
-COPY infrastructure-provisioning/src/general/templates/os/manage_step_certs.sh
/root/templates/
-COPY
infrastructure-provisioning/src/general/templates/os/step-cert-manager.service
/root/templates/
-COPY
infrastructure-provisioning/src/general/templates/os/renew_certificates.sh
/root/templates/
+COPY ssn/ /root/
+COPY general/scripts/gcp/ssn_* /root/scripts/
+COPY general/lib/os/${OS}/ssn_lib.py /usr/lib/python3.8/datalab/ssn_lib.py
+COPY general/files/gcp/ssn_policy.json /root/files/
+COPY general/files/gcp/ssn_roles.json /root/files/
+COPY general/templates/gcp/jenkins_jobs /root/templates/jenkins_jobs
+COPY general/templates/os/manage_step_certs.sh /root/templates/
+COPY general/templates/os/step-cert-manager.service /root/templates/
+COPY general/templates/os/renew_certificates.sh /root/templates/
RUN chmod a+x /root/fabfile.py; \
chmod a+x /root/scripts/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
