[odahu-integration] Bugfixing
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index c7d0213..86e9e65 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -81,7 +81,7 @@
sudo('sed -i "/pip install/s/jupyter/ipython==5.0.0 jupyter==1.0.0/g" Dockerfile')
sudo('sed -i "22i COPY general/files/os/debian/sources.list /etc/apt/sources.list" Dockerfile')
-def login_in_gcr(os_user, gcr_creds, odahu_image, dlab_path):
+def login_in_gcr(os_user, gcr_creds, odahu_image, dlab_path, os_family):
if os.environ['conf_cloud_provider'] != 'gcp':
try:
sudo('echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt '
@@ -100,7 +100,8 @@
local('scp -i {} /tmp/config {}:/tmp/config'.format(args.keyfile, env.host_string, os_user))
sudo('mkdir /home/{}/.docker'.format(os_user))
sudo('cp /tmp/config /home/{}/.docker/config.json'.format(os_user))
- sudo('sed -i "s|ODAHU_IMAGE|{}|" {}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image, dlab_path))
+ sudo('sed -i "s|ODAHU_IMAGE|{}|" {}sources/infrastructure-provisioning/src/general/files/{}/odahu_Dockerfile'
+ .format(odahu_image, dlab_path, os_family))
except Exception as err:
traceback.print_exc()
print('Failed to prepare odahu image: ', str(err))
@@ -204,7 +205,7 @@
sys.exit(1)
print("Login in Google Container Registry")
- login_in_gcr(args.os_user, args.gcr_creds, args.odahu_image, args.dlab_path)
+ login_in_gcr(args.os_user, args.gcr_creds, args.odahu_image, args.dlab_path, args.os_family)
print("Building dlab images")
count = 0
