diff --git a/Dockerfile b/Dockerfile index 93dbcb8..a09e6b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -FROM alpine:edge +FROM alpine:latest -MAINTAINER Diego Hernandes +MAINTAINER Paul Schoenfelder +# Modification France LABEL \ # Location of the STI scripts inside the image @@ -19,7 +20,7 @@ ENV \ REFRESHED_AT=2016-04-7T14:27 # Environments -ENV TIMEZONE=America/Sao_Paulo \ +ENV TIMEZONE=Europe/Paris \ PHP_MEMORY_LIMIT=256M \ MAX_UPLOAD=100M \ PHP_MAX_FILE_UPLOAD=200 \ @@ -29,8 +30,9 @@ RUN mkdir -p ${HOME} && \ mkdir -p /usr/libexec/s2i && \ adduser -s /bin/sh -u 1001 -G root -h ${HOME} -S -D default && \ chown -R 1001:0 /opt/app-root && \ - echo 'http://dl-4.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && \ - echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ + echo 'http://nl.alpinelinux.org/alpine/v3.5/community' >> /etc/apk/repositories && \ + echo "http://nl.alpinelinux.org/alpine/v3.5/releases" >> /etc/apk/repositories && \ + echo "http://nl.alpinelinux.org/alpine/v3.5/main" >> /etc/apk/repositories && \ apk -U upgrade && \ apk add --no-cache --update \ bash \ @@ -45,6 +47,25 @@ RUN mkdir -p ${HOME} && \ lsof \ patch \ caddy \ + # ajout + libcurl \ + libxml2 \ + libxslt \ + openssl-dev \ + zlib-dev \ + make \ + automake \ + gcc \ + g++ \ + binutils-gold \ + linux-headers \ + paxctl \ + libgcc \ + libstdc++ \ + python \ + gnupg \ + ncurses-libs \ + # fin ajout ca-certificates \ php7 \ php7-xml \ @@ -62,6 +83,7 @@ RUN mkdir -p ${HOME} && \ php7-dom \ php7-gd \ php7-intl \ + php7-imap \ php7-mysqlnd \ php7-pdo \ php7-pdo_mysql \ @@ -111,4 +133,4 @@ LABEL io.k8s.description="PHP 7 with Caddy Server on Alpine" \ io.openshift.tags="builder,php,php7,caddy,alpine" \ io.openshift.min-memory="1Gi" \ io.openshift.min-cpu="1" \ - io.openshift.non-scalable="false" \ No newline at end of file + io.openshift.non-scalable="false" diff --git a/README.md b/README.md index 76b0744..d1659ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -## codecasts/s2i-caddy-fpm7 +## Source to Image pour Openshift -Openshift s2i image for running Laravel (or other php projects). +[![](https://images.microbadger.com/badges/image/docprof/s2i-php7.svg)](https://microbadger.com/images/docprof/s2i-php7 "Get your own image badge on microbadger.com") + +Openshift s2i image mise à jour. - Alpine Linux - PHP-FPM 7 diff --git a/basefs/etc/caddy/caddy.conf b/basefs/etc/caddy/caddy.conf index abe457a..9068ead 100644 --- a/basefs/etc/caddy/caddy.conf +++ b/basefs/etc/caddy/caddy.conf @@ -13,4 +13,4 @@ ext / to /index.php?{query} } -} \ No newline at end of file +}