From 5bcb2593a32e85e4c067b4ad3df55c9fa104bb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 20 Nov 2017 01:11:22 +0100 Subject: [PATCH] Docker: fix leveldb installation --- scripts/Dockerfile.alpine.in | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/Dockerfile.alpine.in b/scripts/Dockerfile.alpine.in index 4ff29c838..df547e1bb 100644 --- a/scripts/Dockerfile.alpine.in +++ b/scripts/Dockerfile.alpine.in @@ -3,11 +3,11 @@ FROM alpine:$alpine_version RUN apk update && apk upgrade && \ - apk add build-base snappy-dev abuild \ - alpine-sdk openssh bash nano ncurses-dev rsync xz m4 \ + apk add build-base snappy-dev abuild alpine-sdk \ + openssh bash nano ncurses-dev rsync xz m4 \ opam aspcud \ gmp-dev libev-dev libressl-dev linux-headers pcre-dev perl zlib-dev \ - libsodium-dev snappy-dev && \ + libsodium-dev && \ rm -f /var/cache/apk/* && \ adduser -S opam && \ adduser opam abuild && \ @@ -20,13 +20,6 @@ USER opam WORKDIR /home/opam -COPY scripts/leveldb-1.18.APKBUILD /home/opam/leveldb-1.18/APKBUILD -RUN sudo chown -R opam leveldb-1.18 - -RUN abuild-keygen -a && \ - cd leveldb-1.18 && \ - abuild checksum && abuild -r - RUN mkdir .ssh && \ chmod 700 .ssh && \ git config --global user.email "docker@example.com" && \ @@ -35,6 +28,19 @@ RUN mkdir .ssh && \ sudo -u opam sh -c "opam init -a -y --comp $ocaml_version /home/opam/opam-repository" && \ sudo -u opam sh -c "opam install -y depext travis-opam" +COPY scripts/leveldb-1.18.APKBUILD /home/opam/leveldb-1.18/APKBUILD +RUN sudo chown -R opam leveldb-1.18 + +RUN sudo apk update && \ + abuild-keygen -ai && \ + cd leveldb-1.18 && \ + abuild checksum && abuild -r && \ + cd .. && \ + sudo apk add packages/opam/x86_64/leveldb-1.18-r0.apk && \ + sudo apk add packages/opam/x86_64/leveldb-dev-1.18-r0.apk && \ + rm -rf leveldb-1.18 packages && \ + sudo rm -f /var/cache/apk/* + ENTRYPOINT [ "opam", "config", "exec", "--" ] CMD [ "sh" ]