balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Docker: remove levedb from the docker image

Browse Source
This commit is contained in:
Grégoire Henry 2018-05-27 21:20:52 +02:00 committed by Benjamin Canou
parent a726d7363b
commit 8fd79d1a89
5 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/ci/create_docker_image.minimal.sh
View File

@ -24,13 +24,8 @@ cleanup () {
} }
trap cleanup EXIT INT trap cleanup EXIT INT
"$ci_dir"/create_apk.leveldb.sh
"$ci_dir"/create_apk.hidapi.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 \ cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \
"$build_dir"/keys/ \ "$build_dir"/keys/ \
"$tmp_dir" "$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" LABEL distro_style="apk" distro="alpine" distro_long="alpine-$alpine_version" arch="x86_64" operatingsystem="linux"
COPY keys /etc/apk/keys/ COPY keys /etc/apk/keys/
COPY leveldb-$leveldb_version-r0.apk .
COPY hidapi-$hidapi_version-r0.apk . COPY hidapi-$hidapi_version-r0.apk .
RUN apk --no-cache add \ RUN apk --no-cache add \
libev gmp vim leveldb-$leveldb_version-r0.apk hidapi-$hidapi_version-r0.apk && \ 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 rm hidapi-$hidapi_version-r0.apk
COPY bin/* /usr/local/bin/ COPY bin/* /usr/local/bin/

10
scripts/ci/create_docker_image.opam.sh
View File

@ -19,7 +19,6 @@ cleanup () {
} }
trap cleanup EXIT INT trap cleanup EXIT INT
"$ci_dir"/create_apk.leveldb.sh
"$ci_dir"/create_apk.hidapi.sh "$ci_dir"/create_apk.hidapi.sh
"$ci_dir"/create_binary.opam.sh "$ci_dir"/create_binary.opam.sh
"$ci_dir"/create_opam_repository.tezos_deps.sh "$ci_dir"/create_opam_repository.tezos_deps.sh
@ -31,11 +30,6 @@ echo
image_name="${1:-tezos_opam}" image_name="${1:-tezos_opam}"
image_version="${2:-alpine-${alpine_version}_ocaml-${ocaml_version}}" 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 \ cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \
"$build_dir"/hidapi-dev-$hidapi_version-r0.apk \ "$build_dir"/hidapi-dev-$hidapi_version-r0.apk \
"$build_dir"/keys/ \ "$build_dir"/keys/ \
@ -53,8 +47,6 @@ COPY opam /usr/bin/opam
COPY opam-installer /usr/bin/opam-installer COPY opam-installer /usr/bin/opam-installer
COPY keys /etc/apk/keys/ 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-$hidapi_version-r0.apk .
COPY hidapi-dev-$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 \ ncurses-dev gmp-dev libev-dev \
pcre-dev zlib-dev \ pcre-dev zlib-dev \
snappy snappy-dev \ snappy snappy-dev \
leveldb-$leveldb_version-r0.apk \
leveldb-dev-$leveldb_version-r0.apk \
hidapi-$hidapi_version-r0.apk \ hidapi-$hidapi_version-r0.apk \
hidapi-dev-$hidapi_version-r0.apk && \ hidapi-dev-$hidapi_version-r0.apk && \
adduser -S opam && \ adduser -S opam && \

13
scripts/opam-pin.sh
View File

@ -7,19 +7,6 @@ src_dir="$(dirname "$script_dir")"
export OPAMYES=yes 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) opams=$(find "$src_dir" -name \*.opam -print)
packages= packages=

7
scripts/opam-unpin.sh
View File

@ -8,10 +8,3 @@ src_dir="$(dirname "$script_dir")"
. "$script_dir"/opam-remove.sh . "$script_dir"/opam-remove.sh
opam pin remove $packages opam pin remove $packages
### Temporary HACK
## Should be in sync with `opam-pin.sh`
opam pin remove --no-action leveldb
### End of temporary HACK

1
scripts/version.sh
View File

@ -5,7 +5,6 @@
alpine_version=3.6 alpine_version=3.6
ocaml_version=4.06.1 ocaml_version=4.06.1
leveldb_version=1.18
hidapi_version=0.8.0_rc1 hidapi_version=0.8.0_rc1
opam_version=2.0.0~rc opam_version=2.0.0~rc
opam_tag=2.0.0-rc opam_tag=2.0.0-rc