From 2327bf2183ce8ca42df71f2bc8679e794eb3611e Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Mon, 15 Apr 2024 01:10:01 -0700 Subject: [PATCH] Bump up versions To be consistent with https://github.com/e-mission/e-mission-server/pull/963 --- viz_scripts/Dockerfile | 4 ++++ viz_scripts/docker/Dockerfile.dev | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/viz_scripts/Dockerfile b/viz_scripts/Dockerfile index 4eeddf8a..c1b1baa5 100644 --- a/viz_scripts/Dockerfile +++ b/viz_scripts/Dockerfile @@ -1,5 +1,9 @@ # python 3 +<<<<<<< Updated upstream FROM shankari/e-mission-server:master_2024-04-08--17-44 +======= +FROM shankari/e-mission-server:master_2024-04-15--53-23 +>>>>>>> Stashed changes VOLUME /plots diff --git a/viz_scripts/docker/Dockerfile.dev b/viz_scripts/docker/Dockerfile.dev index 435ea392..38337a6a 100644 --- a/viz_scripts/docker/Dockerfile.dev +++ b/viz_scripts/docker/Dockerfile.dev @@ -1,5 +1,9 @@ # python 3 +<<<<<<< Updated upstream FROM shankari/e-mission-server:master_2024-04-08--17-44 +======= +FROM shankari/e-mission-server:master_2024-04-15--53-23 +>>>>>>> Stashed changes VOLUME /plots