diff --git a/.travis.yml b/.travis.yml index a5b168a..28907cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,14 @@ services: env: matrix: - - DOCKERFILE="2.4" + - DOCKERFILE="Dockerfile" DOCKERPATH="2.4" + - DOCKERFILE="Dockerfile-alpine" DOCKERPATH="2.4" before_script: - docker version script: - - docker build -t ${DOCKERFILE} ./${DOCKERFILE} + - docker build -f ./${DOCKERPATH}/${DOCKERFILE} -t ${DOCKERPATH} ./${DOCKERPATH} after_script: - docker images - - docker ps -a diff --git a/2.4/Dockerfile-alpine b/2.4/Dockerfile-alpine new file mode 100644 index 0000000..bc58c7e --- /dev/null +++ b/2.4/Dockerfile-alpine @@ -0,0 +1,15 @@ +FROM httpd:2.4-alpine +MAINTAINER drupal-docker + +VOLUME /var/www/html +WORKDIR /var/www/html + +COPY httpd.conf /usr/local/apache2/conf/httpd.conf +COPY drupal.conf /usr/local/apache2/conf/drupal.conf + +ENV DOCROOT="/var/www/html" \ + SERVER_NAME="_" + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["httpd-foreground"] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..077fc20 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Drupal Docker + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..18a2b1a --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +APACHE +================= + +[![Build Status](https://travis-ci.org/drupal-docker/apache.svg?branch=master)](https://travis-ci.org/drupal-docker/apache) +[![Docker Pulls](https://img.shields.io/docker/pulls/drupaldocker/apache.svg?maxAge=2592000)](https://hub.docker.com/r/drupaldocker/apache) + +| Version | Tags | Dockerfile | +| --- | --- | --- | +| 2.4 | `latest`, `2.4` | [Dockerfile](https://github.com/drupal-docker/apache/blob/master/2.4/Dockerfile) | +| | `2.4-alpine` | [Dockerfile](https://github.com/drupal-docker/apache/blob/master/2.4/Dockerfile-alpine) |