diff --git a/run/Dockerfile b/run/Dockerfile index 99fa403780b566c50b0973c1f616e76932519f15..de57d32c9c1164ac29a3493a9efdf8ce62961519 100644 --- a/run/Dockerfile +++ b/run/Dockerfile @@ -25,6 +25,6 @@ RUN apk add bash curl jq && \ ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \ wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \ chmod +x /usr/local/bin/docker-compose && \ - sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/l3dcurrentversion + sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/run ENTRYPOINT /bin/sh diff --git a/run/scripts/l3dcurrentversion b/run/scripts/l3dcurrentversion deleted file mode 100755 index 14885ca1b6ae8b8d5eb34bb9d37c36749d30acda..0000000000000000000000000000000000000000 --- a/run/scripts/l3dcurrentversion +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -export L3DVERSION='{{ version }}' diff --git a/run/scripts/run b/run/scripts/run index 191c7a15c23603ad3fcf067f569fa56e1f2f985d..8eea159115267329d54135c882b6fdbbb54491ff 100755 --- a/run/scripts/run +++ b/run/scripts/run @@ -1,6 +1,6 @@ #!/bin/bash -/usr/local/bin/l3dcurrentversion +export L3DVERSION='{{ version }}' COMMAND=start if [[ -n "$1" ]]; then diff --git a/run/scripts/selfupdate b/run/scripts/selfupdate index 2d7420bfc5acf5e6b1141415839706252368d35d..ef93142f9b500fb037a800a2422f063dc56f6389 100755 --- a/run/scripts/selfupdate +++ b/run/scripts/selfupdate @@ -3,7 +3,7 @@ if [[ -n $1 ]]; then NEWVERSION=$1 else - NEWVERSION=$(/usr/local/bin/l3dcurrentversion) + NEWVERSION=$(/usr/local/bin/l3dnewversion) fi if [[ "$NEWVERSION" == "" ]]; then diff --git a/run/scripts/version b/run/scripts/version index 66ebd6c022c842cb008e7a0e09ebed7a97dc1bc9..ba93bf4b2eadf061a65ea4e811039ae144505b84 100755 --- a/run/scripts/version +++ b/run/scripts/version @@ -2,7 +2,7 @@ echo "Version: ${L3DVERSION}" -NEWVERSION=$(/usr/local/bin/l3dcurrentversion) +NEWVERSION=$(/usr/local/bin/l3dnewversion) if [[ "$NEWVERSION" != "" ]]; then echo "" echo "A new version is available: $NEWVERSION"