SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pre-release of 7.2 container

Browse Source
This commit is contained in:
Harvey
2017-12-02 11:03:16 -08:00
parent 03b777057d
commit 705d90d716
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM php:7.1.12-fpm-alpine FROM php:7.2.0-fpm-alpine
LABEL maintainer="Ric Harvey <ric@ngd.io>" LABEL maintainer="Ric Harvey <ric@ngd.io>"
@@ -10,7 +10,7 @@ ENV NGINX_VERSION 1.13.7
ENV LUA_MODULE_VERSION 0.10.11 ENV LUA_MODULE_VERSION 0.10.11
ENV DEVEL_KIT_MODULE_VERSION 0.3.0 ENV DEVEL_KIT_MODULE_VERSION 0.3.0
ENV LUAJIT_LIB=/usr/lib ENV LUAJIT_LIB=/usr/lib
ENV LUAJIT_INC=/usr/include/luajit-2.0 ENV LUAJIT_INC=/usr/include/luajit-2.1
# resolves #166 # resolves #166
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
@@ -100,7 +100,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
done; \ done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \ #&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
&& mkdir -p /usr/src \ && mkdir -p /usr/src \
&& tar -zxC /usr/src -f nginx.tar.gz \ && tar -zxC /usr/src -f nginx.tar.gz \
&& tar -zxC /usr/src -f ndk.tar.gz \ && tar -zxC /usr/src -f ndk.tar.gz \
@@ -158,7 +158,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& ln -sf /dev/stderr /var/log/nginx/error.log && ln -sf /dev/stderr /var/log/nginx/error.log
RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
# sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
echo /etc/apk/respositories && \ echo /etc/apk/respositories && \
apk update && \ apk update && \
apk add --no-cache bash \ apk add --no-cache bash \
@@ -195,8 +194,9 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
--with-png-dir=/usr/include/ \ --with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ && \ --with-jpeg-dir=/usr/include/ && \
#curl iconv session #curl iconv session
docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \ #docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
pecl install xdebug && \ docker-php-ext-install iconv pdo_mysql pdo_sqlite mysqli gd exif intl xsl json soap dom zip opcache && \
#pecl install xdebug && \
docker-php-source delete && \ docker-php-source delete && \
mkdir -p /etc/nginx && \ mkdir -p /etc/nginx && \
mkdir -p /var/www/app && \ mkdir -p /var/www/app && \

1
README.md
View File

@@ -10,6 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | | Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
|-----|-------|-----|--------|--------| |-----|-------|-----|--------|--------|
| latest | Master Branch |1.13.7 | 7.1.12 | 3.4 | | latest | Master Branch |1.13.7 | 7.1.12 | 3.4 |
| 1.4.0 | 7.2 Branch |1.13.7 | 7.2.0 | 3.6 |
For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md) For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md)

8
docs/versioning.md
View File

@@ -13,6 +13,8 @@ We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style n
The latest tag will always follow the master branch in git. the other versions will have releases attached. The latest tag will always follow the master branch in git. the other versions will have releases attached.
#### PHP 7.1
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | | Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
|-----|-------|-----|--------|--------|--------| |-----|-------|-----|--------|--------|--------|
| latest | Master Branch |1.13.2 | 7.1.7 | 3.4 | 0.2.9 | | latest | Master Branch |1.13.2 | 7.1.7 | 3.4 | 0.2.9 |
@@ -41,6 +43,12 @@ The latest tag will always follow the master branch in git. the other versions w
| 1.3.9 | 1.3.9 |1.13.7 | 7.1.11 | 3.4 | 0.3.3 | | 1.3.9 | 1.3.9 |1.13.7 | 7.1.11 | 3.4 | 0.3.3 |
| 1.3.10 | 1.3.10 |1.13.7 | 7.1.12 | 3.4 | 0.3.4 | | 1.3.10 | 1.3.10 |1.13.7 | 7.1.12 | 3.4 | 0.3.4 |
#### PHP 7.2
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
|-----|-------|-----|--------|--------|--------|
| 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 |
These tags will be created as releases on GitHub and as tags in docker hub. These tags will be created as releases on GitHub and as tags in docker hub.
### Unmaintained tags: ### Unmaintained tags: