From 8366643562c4f4f9d1cca7cf6d4dca0e36f2e96a Mon Sep 17 00:00:00 2001 From: ToXiCRising Date: Mon, 24 Apr 2023 21:46:38 +0200 Subject: [PATCH 1/5] updated typo in hotfix version number --- abq2022hf1/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abq2022hf1/Dockerfile b/abq2022hf1/Dockerfile index 7e9c013..73eb56d 100644 --- a/abq2022hf1/Dockerfile +++ b/abq2022hf1/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=lbt:ifort +ARG BASE_IMAGE=kamaro:ifort FROM ${BASE_IMAGE} ARG user ARG uid @@ -17,8 +17,8 @@ RUN \ ls *.tar | xargs -i tar xf {} RUN \ # download and unpack hotfixes - curl -O http://ftp.scc.kit.edu/pub/campus/ABAQUS/SIMULIA_2022/updates/2022.FP.CFA.2205.Part_SIMULIA_EstPrd.Linux64.tar && \ - tar -xvf 2022.FP.CFA.2205.Part_SIMULIA_EstPrd.Linux64.tar + curl -O http://ftp.scc.kit.edu/pub/campus/ABAQUS/SIMULIA_2022/updates/2022.FP.CFA.2250.Part_SIMULIA_EstPrd.Linux64.tar && \ + tar -xvf 2022.FP.CFA.2250.Part_SIMULIA_EstPrd.Linux64.tar RUN \ # change `lsb_release --short --id |sed 's/ //g'` to "CentOS" in base installation and hotfixes sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./AM_SIM_Abaqus_Extend.AllOS/4/SIMULIA_EstablishedProducts/Linux64/1/inst/common/init/Linux.sh && \ From fe7d4fb4c5b55f8a6a20521ab7222b29ef2c26e2 Mon Sep 17 00:00:00 2001 From: ToXiCRising Date: Mon, 24 Apr 2023 21:52:28 +0200 Subject: [PATCH 2/5] fixed the version number in another place aswell --- abq2022hf1/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abq2022hf1/Dockerfile b/abq2022hf1/Dockerfile index 73eb56d..40ca7a7 100644 --- a/abq2022hf1/Dockerfile +++ b/abq2022hf1/Dockerfile @@ -51,7 +51,7 @@ RUN \ RUN \ # remove archives, installation files and config files rm /Part_SIMULIA_EstPrd.Linux64 -rf && \ - rm /2022.FP.CFA.2205.Part_SIMULIA_EstPrd.Linux64.tar -f && \ + rm /2022.FP.CFA.2250.Part_SIMULIA_EstPrd.Linux64.tar -f && \ rm /UserIntentions_CAA.xml /UserIntentions_CODE.xml RUN \ # setup license From 68e7f84acef98ed9c76182067961e7b68a7c6fa7 Mon Sep 17 00:00:00 2001 From: ToXiCRising Date: Thu, 27 Apr 2023 19:28:34 +0200 Subject: [PATCH 3/5] updated abq2022hf1 to hot fix 6 --- {abq2022hf1 => abq2022hf6}/Dockerfile | 10 +++++----- {abq2022hf1 => abq2022hf6}/UserIntentions_CAA.xml | 0 {abq2022hf1 => abq2022hf6}/UserIntentions_CODE.xml | 0 workspaces | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) rename {abq2022hf1 => abq2022hf6}/Dockerfile (93%) rename {abq2022hf1 => abq2022hf6}/UserIntentions_CAA.xml (100%) rename {abq2022hf1 => abq2022hf6}/UserIntentions_CODE.xml (100%) diff --git a/abq2022hf1/Dockerfile b/abq2022hf6/Dockerfile similarity index 93% rename from abq2022hf1/Dockerfile rename to abq2022hf6/Dockerfile index 40ca7a7..7f52733 100644 --- a/abq2022hf1/Dockerfile +++ b/abq2022hf6/Dockerfile @@ -23,8 +23,8 @@ RUN \ # change `lsb_release --short --id |sed 's/ //g'` to "CentOS" in base installation and hotfixes sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./AM_SIM_Abaqus_Extend.AllOS/4/SIMULIA_EstablishedProducts/Linux64/1/inst/common/init/Linux.sh && \ sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./AM_SIM_Abaqus_Extend.AllOS/5/SIMULIA_EstablishedProducts_CAA_API/Linux64/1/inst/common/init/Linux.sh && \ - sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./Part_SIMULIA_EstPrd.Linux64/1/Software/SIMULIA_EstPrd.HF1.Linux64/1/inst/common/init/Linux.sh && \ - sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./Part_SIMULIA_EstPrd.Linux64/1/Software/CAASIMULIA_EstPrd.HF1.Linux64/1/inst/common/init/Linux.sh + sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./Part_SIMULIA_EstPrd.Linux64/1/Software/SIMULIA_EstPrd.HF6.Linux64/1/inst/common/init/Linux.sh && \ + sed -i "s/\`lsb_release --short --id |sed 's\/ \/\/g'\`/\"CentOS\"/g" ./Part_SIMULIA_EstPrd.Linux64/1/Software/CAASIMULIA_EstPrd.HF6.Linux64/1/inst/common/init/Linux.sh # config file for 'silent' base installation COPY --chown=${uid}:${uid} UserIntentions_CODE.xml "/UserIntentions_CODE.xml" @@ -44,9 +44,9 @@ RUN \ RUN \ cd ./Part_SIMULIA_EstPrd.Linux64/1/Software/ && \ # CODE install hotfixes - ./SIMULIA_EstPrd.HF1.Linux64/1/StartTUI.sh --silent /UserIntentions_CODE.xml && \ + ./SIMULIA_EstPrd.HF6.Linux64/1/StartTUI.sh --silent /UserIntentions_CODE.xml && \ # CAA install hotfixes - ./CAASIMULIA_EstPrd.HF1.Linux64/1/StartTUI.sh --silent /UserIntentions_CAA.xml && \ + ./CAASIMULIA_EstPrd.HF6.Linux64/1/StartTUI.sh --silent /UserIntentions_CAA.xml && \ cd ../../../ RUN \ # remove archives, installation files and config files @@ -58,7 +58,7 @@ RUN \ mkdir -p /var/DassaultSystemes/Licenses/ && \ echo 'scclic5.scc.kit.edu:4085' > /var/DassaultSystemes/Licenses/DSLicSrv.txt && \ # symlink abaqus to abq2022 - ln /var/DassaultSystemes/SIMULIA/Commands/abq2022hf1 /usr/bin/abaqus + ln /var/DassaultSystemes/SIMULIA/Commands/abq2022hf6 /usr/bin/abaqus RUN \ # install old dependency for pip diff --git a/abq2022hf1/UserIntentions_CAA.xml b/abq2022hf6/UserIntentions_CAA.xml similarity index 100% rename from abq2022hf1/UserIntentions_CAA.xml rename to abq2022hf6/UserIntentions_CAA.xml diff --git a/abq2022hf1/UserIntentions_CODE.xml b/abq2022hf6/UserIntentions_CODE.xml similarity index 100% rename from abq2022hf1/UserIntentions_CODE.xml rename to abq2022hf6/UserIntentions_CODE.xml diff --git a/workspaces b/workspaces index 424dd96..712e866 100644 --- a/workspaces +++ b/workspaces @@ -6,9 +6,9 @@ # containers bashrc to switch between workspaces. declare -A WORKSPACES=( # name workspace path robot ip for remote (optional) - ['dschubba']=' ~/kamaro/dschubba_ws 10.42.0.1' - ['generic']=' ~/kamaro/catkin_ws' - ['beteigeuze']='~/kamaro/beteigeuze_ws 192.168.1.42' - ['virtualfre']='~/kamaro/fre21_ws' - ['ros2']=' ~/kamaro/foxy_ws' + ['dschubba']=' ~/abaqus/workspace 10.42.0.1' + ['generic']=' ~/abaqus/workspace' + ['beteigeuze']='~/abaqus/workspace 192.168.1.42' + ['virtualfre']='~/abaqus/workspace' + ['ros2']=' ~/abaqus/workspace' ) From 874b6ae2e5cc11d209bb204f3695cd0d2bedb24e Mon Sep 17 00:00:00 2001 From: ToXiCRising Date: Fri, 5 May 2023 19:25:38 +0200 Subject: [PATCH 4/5] updated license server --- abq2022hf6/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abq2022hf6/Dockerfile b/abq2022hf6/Dockerfile index 7f52733..cb1bb8f 100644 --- a/abq2022hf6/Dockerfile +++ b/abq2022hf6/Dockerfile @@ -56,7 +56,7 @@ RUN \ RUN \ # setup license mkdir -p /var/DassaultSystemes/Licenses/ && \ - echo 'scclic5.scc.kit.edu:4085' > /var/DassaultSystemes/Licenses/DSLicSrv.txt && \ + echo 'scclic7.scc.kit.edu:4085' > /var/DassaultSystemes/Licenses/DSLicSrv.txt && \ # symlink abaqus to abq2022 ln /var/DassaultSystemes/SIMULIA/Commands/abq2022hf6 /usr/bin/abaqus From 6ee2a4b6dc1511466dd0cb3da7a52e3a09261194 Mon Sep 17 00:00:00 2001 From: ToXiCRising <31574288+ToXiCRising@users.noreply.github.com> Date: Fri, 5 May 2023 19:29:34 +0200 Subject: [PATCH 5/5] Update workspaces --- workspaces | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workspaces b/workspaces index 712e866..2ccff3a 100644 --- a/workspaces +++ b/workspaces @@ -6,9 +6,9 @@ # containers bashrc to switch between workspaces. declare -A WORKSPACES=( # name workspace path robot ip for remote (optional) - ['dschubba']=' ~/abaqus/workspace 10.42.0.1' - ['generic']=' ~/abaqus/workspace' - ['beteigeuze']='~/abaqus/workspace 192.168.1.42' - ['virtualfre']='~/abaqus/workspace' - ['ros2']=' ~/abaqus/workspace' - ) + ['dschubba']=' ~/kamaro/dschubba_ws 10.42.0.1' + ['generic']=' ~/kamaro/catkin_ws' + ['beteigeuze']='~/kamaro/beteigeuze_ws 192.168.1.42' + ['virtualfre']='~/kamaro/fre21_ws' + ['ros2']=' ~/kamaro/foxy_ws' + )