diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..332333c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +docker-compose-test.yml diff --git a/Dockerfile.elasticsearch b/Dockerfile.elasticsearch index c92e9c3..cae6de3 100644 --- a/Dockerfile.elasticsearch +++ b/Dockerfile.elasticsearch @@ -1,4 +1,4 @@ -FROM elasticsearch +FROM elasticsearch:alpine MAINTAINER Zammad ARG BUILD_DATE diff --git a/Dockerfile.nginx b/Dockerfile.nginx index e69df0a..8d1a8da 100644 --- a/Dockerfile.nginx +++ b/Dockerfile.nginx @@ -1,4 +1,4 @@ -FROM nginx +FROM nginx:alpine MAINTAINER Zammad ARG BUILD_DATE diff --git a/Dockerfile.postgresql b/Dockerfile.postgresql index 8d60cf1..6ebeb8e 100644 --- a/Dockerfile.postgresql +++ b/Dockerfile.postgresql @@ -1,4 +1,4 @@ -FROM postgres +FROM postgres:alpine MAINTAINER Zammad ARG BUILD_DATE diff --git a/Dockerfile.zammad b/Dockerfile.zammad index 9f51e16..6e91a71 100644 --- a/Dockerfile.zammad +++ b/Dockerfile.zammad @@ -1,4 +1,4 @@ -FROM ruby:2.3.1 +FROM ruby:2.3.1-slim MAINTAINER Zammad ARG BUILD_DATE @@ -23,10 +23,18 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ EXPOSE 3000 EXPOSE 6042 +# install dependencies +RUN apt-get update && apt-get install -y build-essential git-core libpq5 libpq-dev + # install zammad COPY install-zammad.sh /tmp RUN chmod +x /tmp/install-zammad.sh;/bin/bash -l -c /tmp/install-zammad.sh +# cleanup +RUN apt-get remove --purge -y git-core build-essential bzip2 ca-certificates libffi-dev libgdbm3 libssl-dev procps zlib1g-dev && \ + apt-get autoremove -y && \ + rm -rf /var/lib/apt/lists/* + # docker init COPY docker-entrypoint.sh / RUN chown zammad:zammad /docker-entrypoint.sh;chmod +x /docker-entrypoint.sh diff --git a/hooks/config b/hooks/config index c004e65..4337c80 100644 --- a/hooks/config +++ b/hooks/config @@ -3,5 +3,4 @@ # build hooks config # -DOCKER_REPO="zammad/zammad-docker-compose" DOCKER_IMAGES="elasticsearch nginx postgresql zammad"