From e4f9a35c8d94e982d055fdad5679ef561dbe318e Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Tue, 2 Jun 2020 14:18:38 +0200 Subject: [PATCH] update versions of external applications (#401) --- .ci/setup-tools.sh | 2 +- .travis.yml | 2 +- base/Dockerfile | 4 ++-- build/Dockerfile | 6 +++--- kwmserver/Dockerfile | 2 +- scheduler/Dockerfile | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci/setup-tools.sh b/.ci/setup-tools.sh index 0764ca5..08cef0b 100755 --- a/.ci/setup-tools.sh +++ b/.ci/setup-tools.sh @@ -3,7 +3,7 @@ set -euo pipefail IFS=$'\n\t' -COMMANDER_VERSION=2.0.0 +COMMANDER_VERSION=2.1.0 DOCKER_COMPOSE_VERSION=1.25.5 GOSS_VERSION=0.3.11 HADOLINT_VERSION=1.17.6 diff --git a/.travis.yml b/.travis.yml index 8f0a722..5941d12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: - docker before_install: - sudo rm /usr/local/bin/docker-compose # remove pre-installed docker-compose (too old) - - bash .ci/setup-tools.sh + - bash -x .ci/setup-tools.sh - .ci/travis-buildkit.sh # upgrade docker for buildkit support install: - "./version.sh" diff --git a/base/Dockerfile b/base/Dockerfile index 5014d2a..b6c5c72 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -54,12 +54,12 @@ RUN apt-get update && \ RUN groupadd --system --gid ${KOPANO_GID} kopano RUN useradd --system --shell /usr/sbin/nologin --home /var/lib/kopano --gid ${KOPANO_GID} --uid ${KOPANO_UID} kopano -ENV DOCKERIZE_VERSION v0.11.0 +ENV DOCKERIZE_VERSION v0.11.6 RUN curl -sfL https://github.com/powerman/dockerize/releases/download/"$DOCKERIZE_VERSION"/dockerize-"$(uname -s)"-"$(uname -m)" \ | install /dev/stdin /usr/local/bin/dockerize && \ dockerize --version -ENV GOSS_VERSION v0.3.7 +ENV GOSS_VERSION v0.3.11 RUN curl -L https://github.com/aelsabbahy/goss/releases/download/$GOSS_VERSION/goss-linux-amd64 -o /usr/local/bin/goss && \ chmod +rx /usr/local/bin/goss && \ goss --version diff --git a/build/Dockerfile b/build/Dockerfile index e2d2723..e1042da 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,10 +1,10 @@ FROM koalaman/shellcheck-alpine:v0.7.1 as shellcheck FROM docker:19.03 ENV \ - COMMANDER_VERSION=1.2.1 \ + COMMANDER_VERSION=2.1.0 \ COMPOSE_VERSION=1.19.0 \ - GOSS_VERSION=0.3.7 \ - HADOLINT_VERSION=1.17.1 \ + GOSS_VERSION=0.3.11 \ + HADOLINT_VERSION=1.17.6 \ REG_VERSION=0.16.1 \ TRIVY_VERSION=0.1.1 diff --git a/kwmserver/Dockerfile b/kwmserver/Dockerfile index 5d794f4..203a141 100644 --- a/kwmserver/Dockerfile +++ b/kwmserver/Dockerfile @@ -15,7 +15,7 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/ash", "-eo", "pipefail", "-c"] USER root -ENV DOCKERIZE_VERSION v0.11.0 +ENV DOCKERIZE_VERSION v0.11.6 RUN wget -O - https://github.com/powerman/dockerize/releases/download/"$DOCKERIZE_VERSION"/dockerize-"$(uname -s)"-"$(uname -m)" | install /dev/stdin /bin/dockerize USER nobody diff --git a/scheduler/Dockerfile b/scheduler/Dockerfile index ac3e9f1..dc6732a 100644 --- a/scheduler/Dockerfile +++ b/scheduler/Dockerfile @@ -2,7 +2,7 @@ FROM docker:19.03 ENV \ DOCKERIZE_VERSION=v0.6.1 \ - GOSS_VERSION=v0.3.7 \ + GOSS_VERSION=v0.3.11 \ SUPERCRONIC_VERSION=0.1.9 LABEL maintainer=az@zok.xyz \