From 8fd79d1a89b963fc6385c667e6e2cc279f1641d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Sun, 27 May 2018 21:20:52 +0200
Subject: [PATCH] Docker: remove levedb from the docker image

---
 scripts/ci/create_docker_image.minimal.sh |  7 -------
 scripts/ci/create_docker_image.opam.sh    | 10 ----------
 scripts/opam-pin.sh                       | 13 -------------
 scripts/opam-unpin.sh                     |  7 -------
 scripts/version.sh                        |  1 -
 5 files changed, 38 deletions(-)

diff --git a/scripts/ci/create_docker_image.minimal.sh b/scripts/ci/create_docker_image.minimal.sh
index 358715a65..bcabf0ead 100755
--- a/scripts/ci/create_docker_image.minimal.sh
+++ b/scripts/ci/create_docker_image.minimal.sh
@@ -24,13 +24,8 @@ cleanup () {
 }
 trap cleanup EXIT INT
 
-"$ci_dir"/create_apk.leveldb.sh
 "$ci_dir"/create_apk.hidapi.sh
 
-cp -a "$build_dir"/leveldb-$leveldb_version-r0.apk \
-      "$build_dir"/keys/ \
-      "$tmp_dir"
-
 cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \
       "$build_dir"/keys/ \
       "$tmp_dir"
@@ -57,12 +52,10 @@ FROM alpine:$alpine_version
 LABEL distro_style="apk" distro="alpine" distro_long="alpine-$alpine_version" arch="x86_64" operatingsystem="linux"
 
 COPY keys /etc/apk/keys/
-COPY leveldb-$leveldb_version-r0.apk .
 COPY hidapi-$hidapi_version-r0.apk .
 
 RUN apk --no-cache add \
       libev gmp vim leveldb-$leveldb_version-r0.apk hidapi-$hidapi_version-r0.apk && \
-    rm leveldb-$leveldb_version-r0.apk && \
     rm hidapi-$hidapi_version-r0.apk
 
 COPY bin/* /usr/local/bin/
diff --git a/scripts/ci/create_docker_image.opam.sh b/scripts/ci/create_docker_image.opam.sh
index 21ea052f8..b9ff19a63 100755
--- a/scripts/ci/create_docker_image.opam.sh
+++ b/scripts/ci/create_docker_image.opam.sh
@@ -19,7 +19,6 @@ cleanup () {
 }
 trap cleanup EXIT INT
 
-"$ci_dir"/create_apk.leveldb.sh
 "$ci_dir"/create_apk.hidapi.sh
 "$ci_dir"/create_binary.opam.sh
 "$ci_dir"/create_opam_repository.tezos_deps.sh
@@ -31,11 +30,6 @@ echo
 image_name="${1:-tezos_opam}"
 image_version="${2:-alpine-${alpine_version}_ocaml-${ocaml_version}}"
 
-cp -a "$build_dir"/leveldb-$leveldb_version-r0.apk \
-      "$build_dir"/leveldb-dev-$leveldb_version-r0.apk \
-      "$build_dir"/keys/ \
-      "$tmp_dir"
-
 cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \
       "$build_dir"/hidapi-dev-$hidapi_version-r0.apk \
       "$build_dir"/keys/ \
@@ -53,8 +47,6 @@ COPY opam /usr/bin/opam
 COPY opam-installer /usr/bin/opam-installer
 
 COPY keys /etc/apk/keys/
-COPY leveldb-$leveldb_version-r0.apk .
-COPY leveldb-dev-$leveldb_version-r0.apk .
 COPY hidapi-$hidapi_version-r0.apk .
 COPY hidapi-dev-$hidapi_version-r0.apk .
 
@@ -64,8 +56,6 @@ RUN apk --no-cache add \
         ncurses-dev gmp-dev libev-dev \
         pcre-dev zlib-dev \
         snappy snappy-dev \
-        leveldb-$leveldb_version-r0.apk \
-        leveldb-dev-$leveldb_version-r0.apk \
         hidapi-$hidapi_version-r0.apk \
         hidapi-dev-$hidapi_version-r0.apk && \
     adduser -S opam && \
diff --git a/scripts/opam-pin.sh b/scripts/opam-pin.sh
index 15f471d47..a3291b085 100755
--- a/scripts/opam-pin.sh
+++ b/scripts/opam-pin.sh
@@ -7,19 +7,6 @@ src_dir="$(dirname "$script_dir")"
 
 export OPAMYES=yes
 
-### Temporary HACK
-
-## Should be in sync with `opam-unpin.sh`
-opam pin add --no-action leveldb git://github.com/chambart/ocaml-leveldb.git#update_4.06
-
-## Unpin package we used to pin...
-opam pin remove --no-action ocp-ocamlres
-opam pin remove --no-action ocplib-resto
-opam pin remove --no-action sodium
-opam pin remove --no-action ocplib-json-typed
-
-### End of temporary HACK
-
 opams=$(find "$src_dir" -name \*.opam -print)
 
 packages=
diff --git a/scripts/opam-unpin.sh b/scripts/opam-unpin.sh
index 528163714..8a2b4df55 100755
--- a/scripts/opam-unpin.sh
+++ b/scripts/opam-unpin.sh
@@ -8,10 +8,3 @@ src_dir="$(dirname "$script_dir")"
 . "$script_dir"/opam-remove.sh
 
 opam pin remove $packages
-
-### Temporary HACK
-
-## Should be in sync with `opam-pin.sh`
-opam pin remove --no-action leveldb
-
-### End of temporary HACK
diff --git a/scripts/version.sh b/scripts/version.sh
index 08562a6fe..5ef1dcb82 100644
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -5,7 +5,6 @@
 
 alpine_version=3.6
 ocaml_version=4.06.1
-leveldb_version=1.18
 hidapi_version=0.8.0_rc1
 opam_version=2.0.0~rc
 opam_tag=2.0.0-rc