Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mise à jour #1

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM alpine:edge
FROM alpine:latest

MAINTAINER Diego Hernandes <[email protected]>
MAINTAINER Paul Schoenfelder <[email protected]>
# Modification France

LABEL \
# Location of the STI scripts inside the image
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -62,6 +83,7 @@ RUN mkdir -p ${HOME} && \
php7-dom \
php7-gd \
php7-intl \
php7-imap \
php7-mysqlnd \
php7-pdo \
php7-pdo_mysql \
Expand Down Expand Up @@ -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"
io.openshift.non-scalable="false"
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion basefs/etc/caddy/caddy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
ext /
to /index.php?{query}
}
}
}