Skip to content

Commit

Permalink
core: Fix bcrypt dep on 0.x (#1465)
Browse files Browse the repository at this point in the history
Following 131b754
  • Loading branch information
ddeboer committed Oct 4, 2016
1 parent e7f02b0 commit 72ac3ad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN sed -f docker/erlang.config.sed priv/erlang.config.in > /etc/zotonic/erlang.

# Note: dumb-init and gosu are pulled from edge; remove that when upgrading to an alpine release that
# includes those packages.
RUN apk add --virtual build-deps --no-cache ca-certificates wget curl make gcc musl-dev g++ bsd-compat-headers git \
&& apk add --no-cache bash imagemagick \
RUN apk add --virtual build-deps --no-cache ca-certificates wget curl make gcc musl-dev g++ git \
&& apk add --no-cache bash bsd-compat-headers imagemagick \
&& apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ dumb-init \
&& apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ gosu \
erlang erlang-inets erlang-compiler erlang-crypto erlang-mnesia erlang-ssl erlang-stdlib erlang-public-key erlang-tools erlang-dev erlang-asn1 erlang-syntax-tools erlang-eunit erlang-parsetools erlang-snmp erlang-sasl erlang-xmerl erlang-erl-interface \
Expand Down
4 changes: 2 additions & 2 deletions rebar.config.lock
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
{git,"https://github.com/mworrell/twerl.git",
"511187da785903d64f5b284ae1d2888b07199e2f"}},
{bcrypt,".*",
{git,"https://github.com/chef/erlang-bcrypt.git",
"5cbe6becbe926739adebc67c6827ac2a2b9e7bbd"}},
{git,"https://github.com/smarkets/erlang-bcrypt",
"a63df34d4957dbb70a703c67c75ed9fee2c78971"}},
{erlpass,".*",
{git,"https://github.com/ferd/erlpass.git",
"9699bc21f2dfa7652b723ed5279a0b2e7ff19002"}}]}.
Expand Down

0 comments on commit 72ac3ad

Please sign in to comment.