Skip to content

Commit f77f400

Browse files
committed
Update version to 7.2-alpine3.6
1 parent f1cd03a commit f77f400

File tree

6 files changed

+23
-17
lines changed

6 files changed

+23
-17
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
env:
1111
global:
1212
- COMMIT=${TRAVIS_COMMIT::8}
13-
- REPO=dockerframework/workspace-phpfpm:7.1
13+
- REPO=dockerframework/workspace-phpfpm:7.2-alpine3.6
1414
- CGO_ENABLED=0
1515
- GOOS=linux
1616
- GOARCH=amd64

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockerframework/phpfpm:7.1
1+
FROM dockerframework/phpfpm:7.2-alpine3.6
22

33
# ================================================================================================
44
# Inspiration: Docker Framework (https://github.com/zeroc0d3/docker-framework)
@@ -21,8 +21,8 @@ FROM dockerframework/phpfpm:7.1
2121

2222
MAINTAINER "Laradock Team <mahmoud@zalt.me>"
2323

24-
ENV PHP_VERSION=7.1.16 \
25-
ALPINE_VERSION=3.4 \
24+
ENV PHP_VERSION=7.2.5 \
25+
ALPINE_VERSION=3.6 \
2626
XDEBUG_VERSION=2.6.0
2727

2828
COPY docker-php-source /usr/local/bin/docker-php-source
@@ -32,7 +32,7 @@ RUN chmod 777 /usr/local/bin/docker-php-source
3232
RUN chmod 777 /usr/local/bin/docker-php-ext-*
3333
RUN chmod 777 /usr/local/bin/docker-entrypoint
3434

35-
ENV NODE_VERSION=6.14.2
35+
ENV NODE_VERSION=9.11.1
3636
RUN addgroup -g 1000 node \
3737
&& adduser -u 1000 -G node -s /bin/sh -D node \
3838
&& apk add --no-cache \

Dockerfile.build

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.6
88

99
# dependencies required for running "phpize"
1010
# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
2626
tar \
2727
xz \
2828
# https://github.com/docker-library/php/issues/494
29-
openssl
29+
libressl
3030

3131
# ensure www-data user exists
3232
RUN set -x \
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
5454
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
5555
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5656

57-
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 1729F83938DA44E27BA0F4D3DBDB397470D12172
57+
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
5858

59-
ENV PHP_VERSION 7.1.17
60-
ENV PHP_URL="https://secure.php.net/get/php-7.1.17.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.1.17.tar.xz.asc/from/this/mirror"
61-
ENV PHP_SHA256="1a784806866e06367f7a5c88775d239d6f30041c7ce65a8232d03a3d4de56d56" PHP_MD5=""
59+
ENV PHP_VERSION 7.2.5
60+
ENV PHP_URL="https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror"
61+
ENV PHP_SHA256="af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2" PHP_MD5=""
6262

6363
RUN set -xe; \
6464
\
@@ -98,7 +98,8 @@ RUN set -xe \
9898
coreutils \
9999
curl-dev \
100100
libedit-dev \
101-
openssl-dev \
101+
libressl-dev \
102+
libsodium-dev \
102103
libxml2-dev \
103104
sqlite-dev \
104105
\
@@ -127,6 +128,8 @@ RUN set -xe \
127128
--enable-mbstring \
128129
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
129130
--enable-mysqlnd \
131+
# https://wiki.php.net/rfc/libsodium
132+
--with-sodium=shared \
130133
\
131134
--with-curl \
132135
--with-libedit \
@@ -161,6 +164,9 @@ RUN set -xe \
161164

162165
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
163166

167+
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
168+
RUN docker-php-ext-enable sodium
169+
164170
ENTRYPOINT ["docker-php-entrypoint"]
165171
##<autogenerated>##
166172
WORKDIR /var/www/html

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Workspace-PHPFpm Container
22
Workspace-PHPFpm Container of Docker Framework
33

4-
[![Build Status](https://travis-ci.org/dockerframework/workspace-phpfpm.svg?branch=master)](https://travis-ci.org/dockerframework/workspace-phpfpm) [![](https://images.microbadger.com/badges/image/dockerframework/workspace-phpfpm:7.1.svg)](https://microbadger.com/images/dockerframework/workspace-phpfpm:7.1 "Layers") [![](https://images.microbadger.com/badges/version/dockerframework/workspace-phpfpm:7.1.svg)](https://microbadger.com/images/dockerframework/workspace-phpfpm:7.1 "Version") [![GitHub issues](https://img.shields.io/github/issues/dockerframework/workspace-phpfpm.svg)](https://github.com/dockerframework/workspace-phpfpm/issues) [![GitHub forks](https://img.shields.io/github/forks/dockerframework/workspace-phpfpm.svg)](https://github.com/dockerframework/workspace-phpfpm/network) [![GitHub stars](https://img.shields.io/github/stars/dockerframework/workspace-phpfpm.svg)](https://github.com/dockerframework/workspace-phpfpm/stargazers) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/dockerframework/workspace-phpfpm/master/LICENSE)
4+
[![Build Status](https://travis-ci.org/dockerframework/workspace-phpfpm.svg?branch=master)](https://travis-ci.org/dockerframework/workspace-phpfpm) [![](https://images.microbadger.com/badges/image/dockerframework/workspace-phpfpm:7.2-alpine3.6.svg)](https://microbadger.com/images/dockerframework/workspace-phpfpm:7.2-alpine3.6 "Layers") [![](https://images.microbadger.com/badges/version/dockerframework/workspace-phpfpm:7.2-alpine3.6.svg)](https://microbadger.com/images/dockerframework/workspace-phpfpm:7.2-alpine3.6 "Version") [![GitHub issues](https://img.shields.io/github/issues/dockerframework/workspace-phpfpm.svg)](https://github.com/dockerframework/workspace-phpfpm/issues) [![GitHub forks](https://img.shields.io/github/forks/dockerframework/workspace-phpfpm.svg)](https://github.com/dockerframework/workspace-phpfpm/network) [![GitHub stars](https://img.shields.io/github/stars/dockerframework/workspace-phpfpm.svg)](https://github.com/dockerframework/workspace-phpfpm/stargazers) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/dockerframework/workspace-phpfpm/master/LICENSE)

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ services:
2323
- ./vendor/php-cs-fixer:/usr/local/bin/php-cs-fixer # vendor php-cs-fixer
2424
- ./data/laradock:/var/www/html # volume for data
2525
environment:
26-
- ALPINE_VERSION=3.4
27-
- PHP_VERSION=7.1.16
26+
- ALPINE_VERSION=3.6
27+
- PHP_VERSION=7.2.5
2828
- XDEBUG_VERSION=2.6.0
2929
- DEBUG=1
30-
- NODE_VERSION=6.14.2
30+
- NODE_VERSION=9.11.1
3131
- YARN_VERSION=1.6.0

tests/docker_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
DOCKER_IMAGE="dockerframework/workspace-phpfpm"
4-
DOCKER_TAG="7.1"
4+
DOCKER_TAG="7.2-alpine3.6"
55

66
#### Halt script on error
77
set -e

0 commit comments

Comments
 (0)