From 9cc4343612d1643cc20e3d07d96305d2ba078e36 Mon Sep 17 00:00:00 2001 From: Marat Bakeev Date: Fri, 13 Sep 2019 11:14:38 +1200 Subject: [PATCH 1/2] Install boto3 from apk testing --- 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 f4eed18..934f842 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -5,7 +5,7 @@ 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 py3-pip py3-requests python3-dev libffi-dev libressl-dev libressl build-base && \ +RUN apk add --no-cache bash git curl rsync openssh-client py3-pip py3-requests py3-boto3@testing python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ pip3 install ansible==2.8.4 && \ apk del python3-dev libffi-dev libressl-dev build-base diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 114201a..31e00d7 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -5,7 +5,7 @@ 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 py3-pip py3-requests python3-dev libffi-dev libressl-dev libressl build-base && \ +RUN apk add --no-cache bash git curl rsync openssh-client py3-pip py3-requests py3-boto3@testing python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ pip3 install ansible==2.8.4 && \ apk del python3-dev libffi-dev libressl-dev build-base diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 45115e0..394b8f0 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -5,7 +5,7 @@ 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 py3-pip py3-requests python3-dev libffi-dev libressl-dev libressl build-base && \ +RUN apk add --no-cache bash git curl rsync openssh-client py3-pip py3-requests py3-boto3@testing python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ pip3 install ansible==2.8.4 && \ apk del python3-dev libffi-dev libressl-dev build-base From 01e10e2d04c23e4843d22423448a05b9f44dd6a0 Mon Sep 17 00:00:00 2001 From: Marat Bakeev Date: Sat, 14 Sep 2019 00:01:57 +1200 Subject: [PATCH 2/2] fixing mysteries of alpine apk --- 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 934f842..544cd8a 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 py3-pip py3-requests py3-boto3@testing python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ pip3 install ansible==2.8.4 && \ - apk del python3-dev libffi-dev libressl-dev build-base + apk del --no-cache python3-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 31e00d7..7685ac4 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 py3-pip py3-requests py3-boto3@testing python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ pip3 install ansible==2.8.4 && \ - apk del python3-dev libffi-dev libressl-dev build-base + apk del --no-cache python3-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 394b8f0..43fc206 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 py3-pip py3-requests py3-boto3@testing python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ pip3 install ansible==2.8.4 && \ - apk del python3-dev libffi-dev libressl-dev build-base + apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/arm64/drone-ansible /bin/ ENTRYPOINT ["/bin/drone-ansible"]