Skip to content

Commit

Permalink
Use alpine:edge to use OTP 21.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Christophe Romain committed Jan 17, 2019
1 parent ae7eb92 commit 624eb25
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions ecs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ RUN mkdir runtime \
&& echo 'beam_lib:strip_files(filelib:wildcard("lib/*/ebin/*beam")), init:stop().' | erts*/bin/erl -boot start_clean >/dev/null \
&& mv erts*/bin/* bin \
&& rm -rf releases erts* bin/*src bin/dialyzer bin/typer \
&& rm bin/ejabberd bin/ejabberd.bat bin/ejabberd_loader.sh
&& rm bin/ejabberd bin/ejabberd.bat

# Runtime container
FROM alpine:3.8
FROM alpine:edge
ARG VERSION
ENV TERM=xterm \
LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -71,7 +71,7 @@ RUN chmod 755 bin/ejabberdctl bin/ejabberdapi bin/erl
COPY --chown=ejabberd:ejabberd conf conf/
ADD --chown=ejabberd:ejabberd https://download.process-one.net/cacert.pem conf/cacert.pem

# Set up runtime environment
# Setup runtime environment
USER ejabberd
VOLUME ["$HOME/database","$HOME/conf","$HOME/logs"]
EXPOSE 5222 5269 5280 5443
Expand Down
2 changes: 1 addition & 1 deletion ecs/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ current=$(date +%y.%m)
version=${1:-$current}

docker build --build-arg VERSION=$version -t ejabberd/ecs:$version .
docker tag ejabberd/ecs:$version ejabberd/ecs:latest
[ "$version" = "latest" ] || docker tag ejabberd/ecs:$version ejabberd/ecs:latest
4 changes: 2 additions & 2 deletions mix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM alpine:3.8
FROM alpine:edge
LABEL maintainer="ProcessOne <[email protected]>" \
product="Ejabberd mix development environment"

# Install required dependencies
RUN apk upgrade --update musl \
&& apk add build-base git zlib-dev openssl-dev yaml-dev expat-dev sqlite-dev \
gd-dev jpeg-dev libpng-dev libwebp-dev autoconf automake \
gd-dev jpeg-dev libpng-dev libwebp-dev autoconf automake bash \
elixir erlang-crypto erlang-eunit erlang-mnesia erlang-erts erlang-hipe \
erlang-tools erlang-os-mon erlang-syntax-tools erlang-parsetools \
erlang-runtime-tools erlang-reltool file curl \
Expand Down

0 comments on commit 624eb25

Please sign in to comment.