You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2020/01/29 12:10:21 UTC
[incubator-dlab] branch odahu-integration updated:
[odahu-integration] Added support of nexus repository
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 71fe6e9 [odahu-integration] Added support of nexus repository
71fe6e9 is described below
commit 71fe6e92ca2e7f47a570a0aa142a5b00c1122673
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Wed Jan 29 14:09:53 2020 +0200
[odahu-integration] Added support of nexus repository
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
.../src/general/files/gcp/odahu_Dockerfile | 2 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 ++++++--
infrastructure-provisioning/src/ssn/templates/daemon.json | 5 +++++
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 331a4ca..d1f8731 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -201,6 +201,8 @@ docker_version = 17.09.0
# subdomain =
### Role ARN for creating Route53 record
# assume_role_arn =
+### URL to Nexus repository
+nexus_url = ec2-35-163-186-140.us-west-2.compute.amazonaws.com:8083
#--- [edge] section contains all parameters that are using for edge node provisioning ---#
[edge]
diff --git a/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile b/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile
index 231ff1d..d2df3fb 100644
--- a/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile
@@ -19,7 +19,7 @@
#
# ******************************************************************************
-FROM <ODAHU_REPO>
+FROM <NEXUS_URL>/odahu-flow-automation:1.1.0
ARG OS
ARG SRC_PATH
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index b028b8d..69dcae1 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -240,8 +240,12 @@ if __name__ == "__main__":
os.environ['conf_cloud_provider'], ssn_conf['region'])
try:
- sudo("sed -i \'s|<ODAHU_REPO>|{}|g\' {}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
- format(os.environ['odahu_docker_private_repo'], os.environ['ssn_dlab_path']))
+ put('/root/templates/daemon.json', '/etc/docker/daemon.json')
+ sudo("sed -i \'s|<NEXUS_URL>|{}|g\' /etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
+ sudo('systemctl restart docker')
+ sudo("sed -i \'s|<NEXUS_URL>|{}|g\' {}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(os.environ['ssn_nexus_url'], os.environ['ssn_dlab_path']))
+# sudo("sed -i \'s|<ODAHU_REPO>|{}|g\' {}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
+# format(os.environ['odahu_docker_private_repo'], os.environ['ssn_dlab_path']))
local("~/scripts/{}.py {}".format('configure_docker', params))
except:
traceback.print_exc()
diff --git a/infrastructure-provisioning/src/ssn/templates/daemon.json b/infrastructure-provisioning/src/ssn/templates/daemon.json
new file mode 100644
index 0000000..e2257ae
--- /dev/null
+++ b/infrastructure-provisioning/src/ssn/templates/daemon.json
@@ -0,0 +1,5 @@
+{
+ "insecure-registries":["<NEXUS_URL>"],
+ "registry-mirrors": ["http://<NEXUS_URL>"],
+ "disable-legacy-registry": true
+}
\ 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