diff --git a/Makefile b/Makefile index 7c3e16e66..183add019 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DOKKU_VERSION ?= master TARGETARCH ?= amd64 -DOCKER_IMAGE_LABELER_VERSION ?= 0.5.0 +DOCKER_IMAGE_LABELER_VERSION ?= 0.6.1 DOCKER_CONTAINER_HEALTHCHECKER_VERSION ?= 0.6.4 HEROKUISH_VERSION ?= 0.6.0 LAMBDA_BUILDER_VERSION ?= 0.4.0 diff --git a/debian/control b/debian/control index df086042d..41019d8a4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.31.1 Section: web Priority: optional Architecture: amd64 -Depends: apache2-utils, 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-compose-plugin | moby-compose, docker-container-healthchecker (>= 0.6.4), docker-image-labeler (>= 0.2.2), lambda-builder, net-tools, netrc, software-properties-common, parallel, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsync, rsyslog, dos2unix, jq, unzip +Depends: apache2-utils, 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-compose-plugin | moby-compose, docker-container-healthchecker (>= 0.6.4), docker-image-labeler (>= 0.6.1), lambda-builder, net-tools, netrc, software-properties-common, parallel, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsync, rsyslog, dos2unix, jq, unzip Recommends: herokuish (>= 0.7.0), bash-completion, 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/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index c3b3f4b2f..e1ce4d0f4 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -33,7 +33,7 @@ trigger-builder-pack-builder-build() { plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR" pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "${ENV_ARGS[@]}" - docker-image-labeler --label=dokku --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=pack --label=com.dokku.app-name=$APP "$IMAGE" + docker-image-labeler relabel --label=dokku --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=pack --label=com.dokku.app-name=$APP "$IMAGE" # ensure we have a port mapping plugn trigger ports-configure "$APP" diff --git a/plugins/builder-pack/builder-release b/plugins/builder-pack/builder-release index 0bcb8ace9..21f836e8a 100755 --- a/plugins/builder-pack/builder-release +++ b/plugins/builder-pack/builder-release @@ -15,7 +15,7 @@ trigger-builder-pack-builder-release() { plugn trigger pre-release-pack "$APP" "$IMAGE_TAG" local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG") - docker-image-labeler --label=com.dokku.image-stage=release --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE" + docker-image-labeler relabel --label=com.dokku.image-stage=release --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE" plugn trigger post-release-builder "$BUILDER_TYPE" "$APP" "$IMAGE" }