From 8c70ddb64ddefffcdde64fbe5f7775e180cf8cf0 Mon Sep 17 00:00:00 2001 From: Mickael Remond Date: Sun, 16 Jul 2017 18:51:03 +0200 Subject: [PATCH] Update docker image to ejabberd 17.07 --- ejabberd-base/Dockerfile | 8 ++++---- ejabberd-base/build.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ejabberd-base/Dockerfile b/ejabberd-base/Dockerfile index 99f80f6..7d6a6cb 100644 --- a/ejabberd-base/Dockerfile +++ b/ejabberd-base/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.5 +FROM alpine:3.6 MAINTAINER ProcessOne -ENV REFRESHED_AT=2017-03-17 \ +ENV REFRESHED_AT=2017-07-16 \ HOME=/home/p1 \ TERM=xterm \ LC_ALL=C.UTF-8 \ @@ -25,8 +25,8 @@ COPY ejabberd.yml ${HOME}/cfg/ # TODO Make it possible to define which version of Alpine we would like to use. RUN echo \ - && echo "http://nl.alpinelinux.org/alpine/v3.5/main" > /etc/apk/repositories \ - && echo "http://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories && \ + && echo "http://nl.alpinelinux.org/alpine/v3.6/main" > /etc/apk/repositories \ + && echo "http://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories && \ apk upgrade --update musl && \ apk add bash su-exec libstdc++ ncurses-libs openssl expat yaml zlib sqlite && \ diff --git a/ejabberd-base/build.sh b/ejabberd-base/build.sh index 9449e67..1fdc5d8 100755 --- a/ejabberd-base/build.sh +++ b/ejabberd-base/build.sh @@ -1,6 +1,6 @@ #/bin/bash -VERSION=17.03 +VERSION=17.07 GREEN='\033[0;32m' NC='\033[0m' # No Color]]' @@ -32,7 +32,7 @@ if [ ! -e ejabberd.tar.gz ]; then # Force clock resync ? #docker run -it --rm --privileged --entrypoint="/sbin/hwclock" ejabberd/mix -s # Build ejabberd and generate release - docker run -it -v $(pwd)/ejbuild:$(pwd)/ejbuild -w $(pwd)/ejbuild -e "MIX_ENV=prod" ejabberd/mix do deps.get, deps.compile, compile, release --env=prod + docker run -it -v $(pwd)/ejbuild:$(pwd)/ejbuild -w $(pwd)/ejbuild -e "MIX_ENV=prod" ejabberd/mix do deps.get, deps.compile, compile, release.init, release --env=prod # Copy generated ejabberd release archive cp ejbuild/_build/prod/rel/ejabberd/releases/*/ejabberd.tar.gz . fi