From 963b610ee9d715a1757bde6e678e7a4941d656ff Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 8 May 2024 12:27:52 -0400 Subject: [PATCH 1/4] install.sh: use eic_xl by default --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index cb53294..a969663 100755 --- a/install.sh +++ b/install.sh @@ -7,7 +7,7 @@ ## with the $EIC_SHELL_PREFIX variable pointing ## to the $PREFIX/local directory -CONTAINER="jug_xl" +CONTAINER="eic_xl" VERSION="nightly" PREFIX="$PWD" From f7d937949064ad9654a077233cb428479a38228e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 26 Jun 2024 11:54:08 -0400 Subject: [PATCH 2/4] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c2e93b4..9bfe12a 100644 --- a/README.md +++ b/README.md @@ -41,11 +41,11 @@ Installation for Development Usage **Note: this container download script is meant for expert usage. If it is unclear to you why you would want to do this, you are probably looking for the simple installation above.** -You can use the same install scripts to setup other container setups, including `jug_dev` -(the main development container). Note that for `jug_dev` there is no nighlty release, and -the appropriate version (tag) would be `testing`. To setup the `jug_dev:testing` environment, do +You can use the same install scripts to setup other container setups, including `eic_dev` +(the main development container). Note that for `eic_dev` there is no nighlty release, and +the appropriate version (tag) would be `testing`. To setup the `eic_dev:testing` environment, do ```bash -curl -L https://github.com/eic/eic-shell/raw/main/install.sh | bash -s -- -c jug_dev -v testing +curl -L https://github.com/eic/eic-shell/raw/main/install.sh | bash -s -- -c eic_dev -v testing ``` Included software: @@ -94,15 +94,15 @@ Using the docker container for your CI purposes **These instructions are old and need updating. In general we recommend using `eicweb/juggler:latest` for most CI usages. This image is functionally identical to -`jug_xl:nightly`** +`eic_xl:nightly`** The docker containers are publicly accessible from [Dockerhub](https://hub.docker.com/u/eicweb). You probably want to use the default -`jug_xl` container. Relevant versions are: - - `eicweb/jug_xl:nightly`: nightly release, with latest detector and reconstruction +`eic_xl` container. Relevant versions are: + - `eicweb/eic_xl:nightly`: nightly release, with latest detector and reconstruction version. This is probably what you want to use unless you are dispatching a large simulation/reconstruciton job - - `eicweb/jug_xl:3.0-stable`: latest stable release, what you want to use for large + - `eicweb/eic_xl:3.0-stable`: latest stable release, what you want to use for large simulation jobs (for reproducibility). Please coordinate with the software group to ensure all desired software changes are present in this container. From 890c81bb91fd52a36d1114ecf90cc1ca845d5484 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 26 Jun 2024 11:54:46 -0400 Subject: [PATCH 3/4] Update install.py --- install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.py b/install.py index 7ff6bb8..cafc41f 100755 --- a/install.py +++ b/install.py @@ -19,7 +19,7 @@ import urllib.request ## Gitlab group and project/program name. -DEFAULT_IMG='jug_xl' +DEFAULT_IMG='eic_xl' DEFAULT_VERSION='3.0.1' SHORTCUTS = ['eic-shell'] @@ -177,7 +177,7 @@ def make_modulefile(project, version, moduledir, bindir): dest='container', default=DEFAULT_IMG, help='(opt.) Container to install. ' - 'D: {} (also available: jug_dev, and legacy "eic" container).') + 'D: {} (also available: eic_dev, and legacy "eic" container).') parser.add_argument( '-v', '--version', dest='version', From 1f8d8af4596829b214a00371b88470e5521887e8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 26 Jun 2024 11:55:04 -0400 Subject: [PATCH 4/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3f93f93..feb6466 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,4 @@ { "name": "eic-shell", - "image": "ghcr.io/eic/jug_xl:nightly", + "image": "ghcr.io/eic/eic_xl:nightly", }