Add dependencies for ARM build (#6908)

Add dependencies for ARM build
This commit is contained in:
Nicolas De loof 2019-10-09 09:38:58 +02:00 committed by GitHub
commit 6fe35498a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View File

@ -30,15 +30,18 @@ RUN apk add --no-cache \
ENV BUILD_BOOTLOADER=1 ENV BUILD_BOOTLOADER=1
FROM python:${PYTHON_VERSION}-${BUILD_DEBIAN_VERSION} AS build-debian FROM python:${PYTHON_VERSION}-${BUILD_DEBIAN_VERSION} AS build-debian
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install --no-install-recommends -y \
curl \ curl \
gcc \ gcc \
git \ git \
libc-dev \ libc-dev \
libffi-dev \
libgcc-6-dev \ libgcc-6-dev \
libssl-dev \
make \ make \
openssl \ openssl \
python2.7-dev python2.7-dev \
zlib1g-dev
FROM build-${BUILD_PLATFORM} AS build FROM build-${BUILD_PLATFORM} AS build
COPY docker-compose-entrypoint.sh /usr/local/bin/ COPY docker-compose-entrypoint.sh /usr/local/bin/

View File

@ -12,6 +12,7 @@ docker build -t "${TAG}" . \
--build-arg GIT_COMMIT="${DOCKER_COMPOSE_GITSHA}" --build-arg GIT_COMMIT="${DOCKER_COMPOSE_GITSHA}"
TMP_CONTAINER=$(docker create "${TAG}") TMP_CONTAINER=$(docker create "${TAG}")
mkdir -p dist mkdir -p dist
docker cp "${TMP_CONTAINER}":/usr/local/bin/docker-compose dist/docker-compose-Linux-x86_64 ARCH=$(uname -m)
docker cp "${TMP_CONTAINER}":/usr/local/bin/docker-compose "dist/docker-compose-Linux-${ARCH}"
docker container rm -f "${TMP_CONTAINER}" docker container rm -f "${TMP_CONTAINER}"
docker image rm -f "${TAG}" docker image rm -f "${TAG}"