diff --git a/.travis.yml b/.travis.yml index f4c718a..2e8f677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: env: global: - - VERSION=1.42 + - VERSION=1.42.01 - GITHUB_REPO=crazy-max/docker-librenms - DOCKER_USERNAME=crazymax - DOCKER_REPONAME=librenms @@ -41,15 +41,16 @@ script: - docker ps | grep $DOCKER_REPONAME after_success: - - test $TRAVIS_PULL_REQUEST = false - && echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin - && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG - && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION - && docker push $DOCKER_USERNAME/$DOCKER_REPONAME - && echo "$QUAY_PASSWORD" | docker login quay.io --username "$QUAY_USERNAME" --password-stdin - && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG - && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION - && docker push quay.io/$QUAY_USERNAME/$QUAY_REPONAME + - | + test $TRAVIS_PULL_REQUEST = false \ + && echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin \ + && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG \ + && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION \ + && docker push $DOCKER_USERNAME/$DOCKER_REPONAME \ + && echo "$QUAY_PASSWORD" | docker login quay.io --username "$QUAY_USERNAME" --password-stdin \ + && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG \ + && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION \ + && docker push quay.io/$QUAY_USERNAME/$QUAY_REPONAME \ && curl -X POST $MICROBADGER_HOOK branches: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f329fd..7179da4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.42.01-RC1 (2018/08/05) + +* Upgrade to LibreNMS 1.42.01 + ## 1.42-RC1 (2018/08/02) * Upgrade to LibreNMS 1.42 diff --git a/Dockerfile b/Dockerfile index 8bd75ff..159c25f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN apk --update --no-cache add \ && sed -i -e "s/;date\.timezone.*/date\.timezone = UTC/" /etc/php7/php.ini \ && rm -rf /var/cache/apk/* /var/www/* /tmp/* -ENV LIBRENMS_VERSION="1.42" \ +ENV LIBRENMS_VERSION="1.42.01" \ LIBRENMS_PATH="/opt/librenms" \ DATA_PATH="/data" \ CRONTAB_PATH="/var/spool/cron/crontabs"