From 7727d70559ea55466a14ddd9800a18b79af1a41b Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Mon, 17 Oct 2016 22:20:46 +0200 Subject: [PATCH 1/6] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE 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. From 1c7c01e014f6be0a4d68a4d51ae41d6215861d07 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Mon, 17 Oct 2016 22:23:26 +0200 Subject: [PATCH 2/6] Create README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..30242b9 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +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) From 2177f4a74a48f15657d9b25f232b9c7dd5f8e978 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Mon, 17 Oct 2016 22:29:11 +0200 Subject: [PATCH 3/6] Add alpine --- .travis.yml | 5 ++--- 2.4/Dockerfile-alpine | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 2.4/Dockerfile-alpine diff --git a/.travis.yml b/.travis.yml index a5b168a..6d99994 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,13 @@ services: env: matrix: - - DOCKERFILE="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"] From 6b915da2eb76e49955687399a8537e49f5d4c540 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Mon, 17 Oct 2016 22:30:44 +0200 Subject: [PATCH 4/6] Add old image to build matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d99994..28907cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ services: env: matrix: + - DOCKERFILE="Dockerfile" DOCKERPATH="2.4" - DOCKERFILE="Dockerfile-alpine" DOCKERPATH="2.4" before_script: From 909280f0e92a96e5fe741c414122a0fe3eadcd53 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Mon, 17 Oct 2016 22:34:53 +0200 Subject: [PATCH 5/6] Add new image to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30242b9..3559c2f 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,4 @@ 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) From 7b3703fc846784f68c26d07a8733f25eb91eab78 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Sat, 25 Mar 2017 18:40:39 +0100 Subject: [PATCH 6/6] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3559c2f..18a2b1a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 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) +| 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) |