From afbaafc71f048a5f6385e153a7d9441bc8ef74b0 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Wed, 26 Feb 2020 18:15:12 +0100
Subject: [PATCH] Moved from "Software" to "containers".
---
{Software => containers}/MetaDesktop/Dockerfile | 0
{Software => containers}/MetaDesktop/build.sh | 0
.../MetaDesktop/files/background.jpg | Bin
.../MetaDesktop/files/dot_fluxbox/apps | 0
.../MetaDesktop/files/dot_fluxbox/init | 0
.../MetaDesktop/files/dot_fluxbox/keys | 0
.../MetaDesktop/files/dot_fluxbox/lastwallpaper | 0
.../MetaDesktop/files/dot_fluxbox/menu | 0
.../MetaDesktop/files/dot_fluxbox/overlay | 0
.../MetaDesktop/files/dot_fluxbox/windowmenu | 0
.../MetaDesktop/files/entrypoint.sh | 0
.../MetaDesktop/files/index.html | 0
.../MetaDesktop/files/noVNC.tar.gz | Bin
.../MetaDesktop/files/run_vnc.sh | 0
{Software => containers}/MetaDesktop/files/sudoers | 0
.../MetaDesktop/files/supervisord.conf | 0
.../MetaDesktop/files/supervisord_vnc.conf | 0
.../MetaDesktop/files/supervisord_webvnc.conf | 0
{Software => containers}/MetaDesktop/files/xstartup | 0
{Software => containers}/MetaDesktop/run.sh | 0
examples/build_tag_push_run-metadesktop.sh | 4 ++--
21 files changed, 2 insertions(+), 2 deletions(-)
rename {Software => containers}/MetaDesktop/Dockerfile (100%)
rename {Software => containers}/MetaDesktop/build.sh (100%)
rename {Software => containers}/MetaDesktop/files/background.jpg (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/apps (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/init (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/keys (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/lastwallpaper (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/menu (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/overlay (100%)
rename {Software => containers}/MetaDesktop/files/dot_fluxbox/windowmenu (100%)
rename {Software => containers}/MetaDesktop/files/entrypoint.sh (100%)
rename {Software => containers}/MetaDesktop/files/index.html (100%)
rename {Software => containers}/MetaDesktop/files/noVNC.tar.gz (100%)
rename {Software => containers}/MetaDesktop/files/run_vnc.sh (100%)
rename {Software => containers}/MetaDesktop/files/sudoers (100%)
rename {Software => containers}/MetaDesktop/files/supervisord.conf (100%)
rename {Software => containers}/MetaDesktop/files/supervisord_vnc.conf (100%)
rename {Software => containers}/MetaDesktop/files/supervisord_webvnc.conf (100%)
rename {Software => containers}/MetaDesktop/files/xstartup (100%)
rename {Software => containers}/MetaDesktop/run.sh (100%)
diff --git a/Software/MetaDesktop/Dockerfile b/containers/MetaDesktop/Dockerfile
similarity index 100%
rename from Software/MetaDesktop/Dockerfile
rename to containers/MetaDesktop/Dockerfile
diff --git a/Software/MetaDesktop/build.sh b/containers/MetaDesktop/build.sh
similarity index 100%
rename from Software/MetaDesktop/build.sh
rename to containers/MetaDesktop/build.sh
diff --git a/Software/MetaDesktop/files/background.jpg b/containers/MetaDesktop/files/background.jpg
similarity index 100%
rename from Software/MetaDesktop/files/background.jpg
rename to containers/MetaDesktop/files/background.jpg
diff --git a/Software/MetaDesktop/files/dot_fluxbox/apps b/containers/MetaDesktop/files/dot_fluxbox/apps
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/apps
rename to containers/MetaDesktop/files/dot_fluxbox/apps
diff --git a/Software/MetaDesktop/files/dot_fluxbox/init b/containers/MetaDesktop/files/dot_fluxbox/init
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/init
rename to containers/MetaDesktop/files/dot_fluxbox/init
diff --git a/Software/MetaDesktop/files/dot_fluxbox/keys b/containers/MetaDesktop/files/dot_fluxbox/keys
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/keys
rename to containers/MetaDesktop/files/dot_fluxbox/keys
diff --git a/Software/MetaDesktop/files/dot_fluxbox/lastwallpaper b/containers/MetaDesktop/files/dot_fluxbox/lastwallpaper
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/lastwallpaper
rename to containers/MetaDesktop/files/dot_fluxbox/lastwallpaper
diff --git a/Software/MetaDesktop/files/dot_fluxbox/menu b/containers/MetaDesktop/files/dot_fluxbox/menu
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/menu
rename to containers/MetaDesktop/files/dot_fluxbox/menu
diff --git a/Software/MetaDesktop/files/dot_fluxbox/overlay b/containers/MetaDesktop/files/dot_fluxbox/overlay
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/overlay
rename to containers/MetaDesktop/files/dot_fluxbox/overlay
diff --git a/Software/MetaDesktop/files/dot_fluxbox/windowmenu b/containers/MetaDesktop/files/dot_fluxbox/windowmenu
similarity index 100%
rename from Software/MetaDesktop/files/dot_fluxbox/windowmenu
rename to containers/MetaDesktop/files/dot_fluxbox/windowmenu
diff --git a/Software/MetaDesktop/files/entrypoint.sh b/containers/MetaDesktop/files/entrypoint.sh
similarity index 100%
rename from Software/MetaDesktop/files/entrypoint.sh
rename to containers/MetaDesktop/files/entrypoint.sh
diff --git a/Software/MetaDesktop/files/index.html b/containers/MetaDesktop/files/index.html
similarity index 100%
rename from Software/MetaDesktop/files/index.html
rename to containers/MetaDesktop/files/index.html
diff --git a/Software/MetaDesktop/files/noVNC.tar.gz b/containers/MetaDesktop/files/noVNC.tar.gz
similarity index 100%
rename from Software/MetaDesktop/files/noVNC.tar.gz
rename to containers/MetaDesktop/files/noVNC.tar.gz
diff --git a/Software/MetaDesktop/files/run_vnc.sh b/containers/MetaDesktop/files/run_vnc.sh
similarity index 100%
rename from Software/MetaDesktop/files/run_vnc.sh
rename to containers/MetaDesktop/files/run_vnc.sh
diff --git a/Software/MetaDesktop/files/sudoers b/containers/MetaDesktop/files/sudoers
similarity index 100%
rename from Software/MetaDesktop/files/sudoers
rename to containers/MetaDesktop/files/sudoers
diff --git a/Software/MetaDesktop/files/supervisord.conf b/containers/MetaDesktop/files/supervisord.conf
similarity index 100%
rename from Software/MetaDesktop/files/supervisord.conf
rename to containers/MetaDesktop/files/supervisord.conf
diff --git a/Software/MetaDesktop/files/supervisord_vnc.conf b/containers/MetaDesktop/files/supervisord_vnc.conf
similarity index 100%
rename from Software/MetaDesktop/files/supervisord_vnc.conf
rename to containers/MetaDesktop/files/supervisord_vnc.conf
diff --git a/Software/MetaDesktop/files/supervisord_webvnc.conf b/containers/MetaDesktop/files/supervisord_webvnc.conf
similarity index 100%
rename from Software/MetaDesktop/files/supervisord_webvnc.conf
rename to containers/MetaDesktop/files/supervisord_webvnc.conf
diff --git a/Software/MetaDesktop/files/xstartup b/containers/MetaDesktop/files/xstartup
similarity index 100%
rename from Software/MetaDesktop/files/xstartup
rename to containers/MetaDesktop/files/xstartup
diff --git a/Software/MetaDesktop/run.sh b/containers/MetaDesktop/run.sh
similarity index 100%
rename from Software/MetaDesktop/run.sh
rename to containers/MetaDesktop/run.sh
diff --git a/examples/build_tag_push_run-metadesktop.sh b/examples/build_tag_push_run-metadesktop.sh
index 09b7589..f4102c3 100755
--- a/examples/build_tag_push_run-metadesktop.sh
+++ b/examples/build_tag_push_run-metadesktop.sh
@@ -3,7 +3,7 @@ set -e
# Build
-cd ../Software/MetaDesktop
+cd ../containers/MetaDesktop
docker build . -t rosetta/metadesktop
cd ../../
@@ -14,7 +14,7 @@ docker tag rosetta/metadesktop localhost:5000/rosetta/metadesktop
docker push localhost:5000/rosetta/metadesktop
# Run
-rosetta/shell slurmclustermaster-main "SINGULARITY_NOHTTPS=true singularity run --pid --writable-tmpfs --containall --cleanenv docker://dregistry:5000/rosetta/metadesktop"
+rosetta/shell slurmclusterworker-one "SINGULARITY_NOHTTPS=true singularity run --pid --writable-tmpfs --containall --cleanenv docker://dregistry:5000/rosetta/metadesktop"
# Run variants/tests
# rosetta/shell slurmclustermaster-main "SINGULARITY_NOHTTPS=true singularity run docker://dregistry:5000/rosetta/metadesktop"
--
GitLab