From 2f2de28e870e861b762ffc1c68d20dea6507da8c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 25 Mar 2019 14:14:22 -0400 Subject: [PATCH] feat: pin busybox to an actual version Rather than dancing around what version of busybox to use, pin it to the latest, known good version of busybox. This will give us confidence in what is being shipped and run on a user's machine. --- install | 2 +- subcommands/destroy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install b/install index f1dde91..5837645 100755 --- a/install +++ b/install @@ -19,7 +19,7 @@ plugin-install() { pull-docker-image "dokku/ambassador:0.2.0" pull-docker-image "dokku/wait:0.3.0" pull-docker-image "dokku/s3backup:0.9.1" - pull-docker-image "busybox:latest" + pull-docker-image "busybox:1.30.1-uclibc" mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE data directory" chown dokku:dokku "$PLUGIN_DATA_ROOT" diff --git a/subcommands/destroy b/subcommands/destroy index 7c69c09..f942150 100755 --- a/subcommands/destroy +++ b/subcommands/destroy @@ -42,7 +42,7 @@ service-destroy-cmd() { service_container_rm "$SERVICE" dokku_log_verbose_quiet "Removing data" - docker run --rm -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/config:/config" busybox:latest chmod 777 -R /config /data + docker run --rm -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/config:/config" busybox:1.30.1-uclibc chmod 777 -R /config /data rm -rf "$SERVICE_ROOT" dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE"