azure and aws updates

- docker volume - azure standalone deploys
Teradata · Nov 20, 2023 · fd60836 · fd60836
1 parent 680f327
commit fd60836
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 272 deletions.
diff --git a/deployments/aws/all-in-one.yaml b/deployments/aws/all-in-one.yaml
@@ -481,16 +481,18 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces
+                ExecStartPre=-/usr/bin/docker network create -d bridge ai_unlimited
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspace
                 ExecStartPre=-/usr/bin/docker exec %n stop || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
                 ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces:${ WorkspacesVersion }
                 ExecStart=/usr/bin/docker run \
                     -e accept_license=Y \
                     -e PLATFORM=aws \
-                    -v /etc/td/workspaces:/etc/td \
+                    -v /etc/td/workspace:/etc/td \
                     -p ${ WorkspacesHttpPort }:3000 \
                     -p ${ WorkspacesGrpcPort }:3282 \
+                    --network ai_unlimited \
                     --rm --name %n teradata/ai-unlimited-workspaces:${ WorkspacesVersion } workspaces serve -v
 
                 [Install]
@@ -519,15 +521,18 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/jupyter
+                ExecStartPre=-/usr/bin/docker network create -d bridge ai_unlimited
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/jupyter/{userdata,ipython}
                 ExecStartPre=-/usr/bin/docker exec %n stop || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
                 ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-jupyter:${ JupyterVersion }
                 ExecStart=/usr/bin/docker run \
                     -e accept_license=Y \
                     -e JUPYTER_TOKEN=${ JupyterToken } \
-                    -v /etc/td/jupyter:/home/jovyan/JupyterLabRoot/userdata \
+                    -v /etc/td/jupyter/userdata:/home/jovyan/JupyterLabRoot/userdata \
+                    -v /etc/td/jupyter/ipython:/home/jovyan/.ipython \
                     -p ${ JupyterHttpPort }:8888 \
+                    --network ai_unlimited \
                     --rm --name %n teradata/ai-unlimited-jupyter:${ JupyterVersion }
 
                 [Install]

diff --git a/deployments/aws/jupyter.yaml b/deployments/aws/jupyter.yaml
@@ -468,15 +468,18 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/jupyter
+                ExecStartPre=-/usr/bin/docker network create -d bridge ai_unlimited
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/jupyter/{userdata,ipython}
                 ExecStartPre=-/usr/bin/docker exec %n stop || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
                 ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-jupyter:${ JupyterVersion }
                 ExecStart=/usr/bin/docker run \
                     -e accept_license=Y \
                     -e JUPYTER_TOKEN=${ JupyterToken } \
-                    -v /etc/td/jupyter:/home/jovyan/JupyterLabRoot/userdata \
+                    -v /etc/td/jupyter/userdata:/home/jovyan/JupyterLabRoot/userdata \
+                    -v /etc/td/jupyter/ipython:/home/jovyan/.ipython \
                     -p ${ JupyterHttpPort }:8888 \
+                    --network ai_unlimited \
                     --rm --name %n teradata/ai-unlimited-jupyter:${ JupyterVersion }
 
                 [Install]