diff --git a/Dockerfile b/Dockerfile index 1d05d5e..12c9a3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,9 @@ RUN set -xe \ bridge-utils iptables jq bash python3 # Environments which may be change -ENV ROUTEROS_VERSON="7.1beta6" -ENV ROUTEROS_IMAGE="chr-$ROUTEROS_VERSON.vdi" -ENV ROUTEROS_PATH="https://download.mikrotik.com/routeros/$ROUTEROS_VERSON/$ROUTEROS_IMAGE" +ENV ROUTEROS_VERSION="7.1beta6" +ENV ROUTEROS_IMAGE="chr-${ROUTEROS_VERSION}.vdi" +ENV ROUTEROS_PATH="https://download.mikrotik.com/routeros/${ROUTEROS_VERSION}/${ROUTEROS_IMAGE}" # Download VDI image from remote site RUN wget "$ROUTEROS_PATH" -O "/routeros/$ROUTEROS_IMAGE" diff --git a/cron.sh b/cron.sh index 0864392..ab4d883 100755 --- a/cron.sh +++ b/cron.sh @@ -36,11 +36,10 @@ getTarballs | while read line; do if [ "x$(checkTag "$tag")" == "x" ] then - url="https://download.mikrotik.com/routeros/$tag/chr-$tag.vdi" if curl --output /dev/null --silent --head --fail "$url"; then echo ">>> URL exists: $url" - sed -r "s/(ROUTEROS_VERSON=\")(.*)(\")/\1$tag\3/g" -i Dockerfile + sed -r "s/(ROUTEROS_VERSION=\")(.*)(\")/\1$tag\3/g" -i Dockerfile git commit -m "Release of RouterOS changed to $tag" -a git push git tag "$tag"