From 0c9cf191e0b6806255e0d5b8ac201ee96485c6bb Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 6 Nov 2017 15:55:15 +0100 Subject: [PATCH] import --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ Dockerfile | 29 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..2c562ae --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,23 @@ +image: docker:latest + +services: + - docker:dind + +before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + +build-master: + stage: build + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE" . + - docker push "$CI_REGISTRY_IMAGE" + only: + - master + +build: + stage: build + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . + - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" + except: + - master diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f901c0d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +FROM "php:7.1-apache" +MAINTAINER "Julien Cabillot " + +RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \ + sed -i'' 's/^$//' '/etc/apache2/sites-enabled/000-default.conf' && \ + echo -e "RemoteIPHeader X-Real-IP\nRemoteIPProxiesHeader X-Forwarded-By" > "${APACHE_CONFDIR}/conf-available/remoteip.conf" && \ + a2enconf remoteip && \ + a2enmod remoteip && \ + apt-get -y autoremove --purge && \ + apt-get -y clean all && \ + rm -rf "/usr/share/doc/*" \ + "/var/cache/*" \ + "/var/lib/apt/lists/*" \ + "/usr/src/*" \ + "/var/cache/*" \ + "/var/log/"{apt/*,dpkg.log} \ + "/var/www/html" \ + "/tmp/*" + +# Add Tini +ENV "TINI_VERSION" "v0.16.1" +ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini" +RUN chmod +x "/tini" +ENTRYPOINT ["/tini", "--"] + +CMD [ "docker-php-entrypoint", "apache2-foreground" ] + +HEALTHCHECK --interval="10s" \ + CMD curl --fail "http://localhost:8080" || exit 1