diff --git a/2.9/Dockerfile b/2.9/Dockerfile index fdd75c4..b465293 100644 --- a/2.9/Dockerfile +++ b/2.9/Dockerfile @@ -1,7 +1,9 @@ FROM debian:buster-slim AS builder +ENV VERSION 2.9.3 + # Builder environment -ENV GIT_BRANCH_RIAK riak-2.9.2 +ENV GIT_BRANCH_RIAK riak-$VERSION ENV GIT_BRANCH_OTP basho-otp-16 ENV APT_RUNTIME_DEPS "git libodbc1 wget" ENV APT_BUILD_DEPS "autoconf curl ca-certificates dpkg-dev gcc libncurses-dev make unixodbc-dev" @@ -13,7 +15,7 @@ RUN apt-get update RUN apt-get install -y --no-install-recommends $APT_RUNTIME_DEPS $APT_BUILD_DEPS $APT_RIAK_DEPS # Build OpenSSL -RUN wget https://www.openssl.org/source/old/openssl-${OPENSSL_VERSION}.tar.gz; tar -xf openssl-${OPENSSL_VERSION}.tar.gz; +RUN wget https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz; tar -xf openssl-${OPENSSL_VERSION}.tar.gz; RUN cd openssl-${OPENSSL_VERSION}; \ ./config shared no-krb5 -fPIC; \ make depend; \ @@ -43,9 +45,11 @@ RUN cd $GIT_BRANCH_RIAK; git checkout -q $GIT_BRANCH_RIAK; make rel # Riak image FROM debian:buster-slim +ENV VERSION 2.9.3 + ENV RIAK_HOME /usr/lib/riak -ENV RIAK_VERSION riak-2.9.2 -ENV RIAK_SRC_PATH /riak-2.9.2 +ENV RIAK_VERSION riak-$VERSION +ENV RIAK_SRC_PATH /riak-$VERSION # Expose default ports EXPOSE 8087 diff --git a/README.md b/README.md index f9da795..d43ac27 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ Based on `ubuntu:16.04`. Installed from [official packages](https://packagecloud Current stable version production ready. -**Riak KV 2.9.2** +**Riak KV 2.9.3** -*Current tags:* [`latest`](https://github.com/kefirgames/riak_docker/blob/master/2.9/Dockerfile), [`2.9`](https://github.com/kefirgames/riak_docker/blob/master/2.9/Dockerfile), [`2.9.2`](https://github.com/kefirgames/riak_docker/blob/master/2.9/Dockerfile) +*Current tags:* [`latest`](https://github.com/kefirgames/riak_docker/blob/master/2.9/Dockerfile), [`2.9`](https://github.com/kefirgames/riak_docker/blob/master/2.9/Dockerfile), [`2.9.3`](https://github.com/kefirgames/riak_docker/blob/master/2.9/Dockerfile) Based on `debian:buster-slim` compiled with OpenSSL 1.0.2u (20-Dec-2019) and Basho's Erlang OTP 16 -First post-basho version. *Use at your own risk.* [Release notes](https://github.com/basho/riak/blob/develop-2.9/RELEASE-NOTES.md#riak-kv-291-release-notes). +First post-basho version. *Use at your own risk.* [Release notes](https://github.com/basho/riak/blob/develop-2.9/RELEASE-NOTES.md#riak-kv-293-release-notes). ###Default storage **LevelDB** (tiered, level 4), use `RIAK_STORAGE_BACKEND` variable to override.