From 988cdbd6bbba6dd458de50deda73d3b6e457da34 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 7 Feb 2021 16:29:55 -0500 Subject: [PATCH] fix: update to docker-image-labeler that handles in-use images Also ensure we keep track of previous docker image tags. Refs #4371 --- Makefile | 2 +- debian/control | 2 +- rpm.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index aca54e5f5..e8d1febab 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DOKKU_VERSION ?= master -DOCKER_IMAGE_LABELER_VERSION ?= 0.2.0 +DOCKER_IMAGE_LABELER_VERSION ?= 0.2.2 HEROKUISH_VERSION ?= 0.5.19 PLUGN_VERSION ?= 0.6.1 PROCFILE_VERSION ?= 0.11.0 diff --git a/debian/control b/debian/control index 1fb49bca8..20cb9d7d7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.23.1 Section: web Priority: optional Architecture: amd64 -Depends: locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.12.0), docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-image-labeler (>= 0.2.0), net-tools, software-properties-common, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsyslog, dos2unix, jq +Depends: locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.12.0), docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-image-labeler (>= 0.2.2), net-tools, software-properties-common, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsyslog, dos2unix, jq Recommends: herokuish (>= 0.3.4), parallel, dokku-update, dokku-event-listener Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python3, debconf Maintainer: Jose Diaz-Gonzalez diff --git a/rpm.mk b/rpm.mk index 8492f4b3f..3048a6869 100644 --- a/rpm.mk +++ b/rpm.mk @@ -35,7 +35,7 @@ endif --depends 'cpio' \ --depends 'curl' \ --depends 'dos2unix' \ - --depends 'docker-image-labeler >= 0.2.0' \ + --depends 'docker-image-labeler >= 0.2.2' \ --depends 'git' \ --depends 'gliderlabs-sigil' \ --depends 'jq' \