From 74ad8b3bb13388f2552d3af09027c55e11a43be2 Mon Sep 17 00:00:00 2001 From: Andrew Rodionoff Date: Sat, 30 Mar 2019 11:39:45 +0300 Subject: [PATCH 1/2] [#16] do not remove libressl-dev package since it breaks vault --- docker/Dockerfile.linux.amd64 | 2 +- docker/Dockerfile.linux.arm | 2 +- docker/Dockerfile.linux.arm64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index b926348..f49544b 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -8,7 +8,7 @@ LABEL maintainer="Drone.IO Community " \ RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl-dev build-base && \ pip install -U pip && \ pip install ansible==2.7.6 && \ - apk del python2-dev libffi-dev libressl-dev build-base + apk del python2-dev libffi-dev build-base ADD release/linux/amd64/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"] diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 1e0390d..3e7b928 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -8,7 +8,7 @@ LABEL maintainer="Drone.IO Community " \ RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl-dev build-base && \ pip install -U pip && \ pip install ansible==2.7.6 && \ - apk del python2-dev libffi-dev libressl-dev build-base + apk del python2-dev libffi-dev build-base ADD release/linux/arm/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"] diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 3c9c3dc..edbdf97 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -8,7 +8,7 @@ LABEL maintainer="Drone.IO Community " \ RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl-dev build-base && \ pip install -U pip && \ pip install ansible==2.7.6 && \ - apk del python2-dev libffi-dev libressl-dev build-base + apk del python2-dev libffi-dev build-base ADD release/linux/arm64/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"] From 928bfc2f0d77271813e559cb2d5b5c6a7dedbcf9 Mon Sep 17 00:00:00 2001 From: Andrew Rodionoff Date: Mon, 1 Apr 2019 09:03:12 +0300 Subject: [PATCH 2/2] [#16] leave libressl, remove libressl-dev --- docker/Dockerfile.linux.amd64 | 4 ++-- docker/Dockerfile.linux.arm | 4 ++-- docker/Dockerfile.linux.arm64 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index f49544b..94d3fe1 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -5,10 +5,10 @@ LABEL maintainer="Drone.IO Community " \ org.label-schema.vendor="Drone.IO Community" \ org.label-schema.schema-version="1.0" -RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl-dev build-base && \ +RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl libressl-dev build-base && \ pip install -U pip && \ pip install ansible==2.7.6 && \ - apk del python2-dev libffi-dev build-base + apk del python2-dev libffi-dev libressl-dev build-base ADD release/linux/amd64/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"] diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 3e7b928..3b65e98 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -5,10 +5,10 @@ LABEL maintainer="Drone.IO Community " \ org.label-schema.vendor="Drone.IO Community" \ org.label-schema.schema-version="1.0" -RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl-dev build-base && \ +RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl libressl-dev build-base && \ pip install -U pip && \ pip install ansible==2.7.6 && \ - apk del python2-dev libffi-dev build-base + apk del python2-dev libffi-dev libressl-dev build-base ADD release/linux/arm/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"] diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index edbdf97..f59a943 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -5,10 +5,10 @@ LABEL maintainer="Drone.IO Community " \ org.label-schema.vendor="Drone.IO Community" \ org.label-schema.schema-version="1.0" -RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl-dev build-base && \ +RUN apk add --no-cache bash git curl rsync openssh-client py-pip py-requests python2-dev libffi-dev libressl libressl-dev build-base && \ pip install -U pip && \ pip install ansible==2.7.6 && \ - apk del python2-dev libffi-dev build-base + apk del python2-dev libffi-dev libressl-dev build-base ADD release/linux/arm64/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"]