From f851ab4a432e380b7c86cdafa427ae76dfc8097c Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Fri, 31 Aug 2018 17:09:46 -0600 Subject: [PATCH] var fix to repair pool (#139) * fixed var name in prep script * docker r file removed Signed-off-by: Cam Parra * prep now using regex as it should have since the start Signed-off-by: Cam Parra * removing docker r Signed-off-by: Cam Parra * comment deleted since it no longer needed --- devops/build-scripts/xenial/Pool_Party/Dockerfile | 6 +++--- devops/build-scripts/xenial/Pool_Party/prep | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devops/build-scripts/xenial/Pool_Party/Dockerfile b/devops/build-scripts/xenial/Pool_Party/Dockerfile index 9bfbbe54..ad412de5 100644 --- a/devops/build-scripts/xenial/Pool_Party/Dockerfile +++ b/devops/build-scripts/xenial/Pool_Party/Dockerfile @@ -56,9 +56,9 @@ ARG python3_indy_crypto_ver=0.4.1 ARG indy_crypto_ver=0.4.0 ARG indy_plenum_ver=1.6.50 -# this should be left blank because the prep will supply the correct version number -ARG sovtoken_pkg_name= -ARG sovtokenfees_pkg_name= + +ARG sovtoken_pkg_name=sovtoken_0.9.1_amd64.deb +ARG sovtokenfees_pkg_name=sovtokenfees_0.9.1_amd64.deb COPY ${sovtoken_pkg_name} /root COPY ${sovtokenfees_pkg_name} /root diff --git a/devops/build-scripts/xenial/Pool_Party/prep b/devops/build-scripts/xenial/Pool_Party/prep index 1c834955..5f4d6449 100755 --- a/devops/build-scripts/xenial/Pool_Party/prep +++ b/devops/build-scripts/xenial/Pool_Party/prep @@ -10,6 +10,6 @@ echo "Your current sovtoken debian package: $fpn \n" echo "summoning warlocks to correct debian package names in the pool dockerfile\n" -sed -i -r "s/sovtoken_pkg_name=/sovtoken_pkg_name=$tpn/" "devops/build-scripts/xenial/Pool_Party/Dockerfile" -sed -i -r "s/sovtokenfees_pkg_name=/sovtokenfees_pkg_name=$tpn/" "devops/build-scripts/xenial/Pool_Party/Dockerfile" +sed -i -r "s/sovtoken_pkg_name=sovtoken_[0-9]\.[0-9]\.[0-9]_amd64.deb/sovtoken_pkg_name=$tpn/" "devops/build-scripts/xenial/Pool_Party/Dockerfile" +sed -i -r "s/sovtokenfees_pkg_name=sovtokenfees_[0-9]\.[0-9]\.[0-9]_amd64.deb/sovtokenfees_pkg_name=$fpn/" "devops/build-scripts/xenial/Pool_Party/Dockerfile"