From 5ddc5d93c3c546dd292e48843ebe2591277ccf82 Mon Sep 17 00:00:00 2001
From: ZeroC0D3 Engineer <dfdenni0912@gmail.com>
Date: Tue, 11 Sep 2018 14:24:40 +0700
Subject: [PATCH 1/2] Update container for alpine 3.8

---
 .gitignore                             |   0
 .travis.yml                            |   0
 Dockerfile                             |   4 ++--
 Dockerfile.build                       |   2 +-
 LICENSE                                |   0
 Makefile.am                            |   0
 Makefile.in                            |   0
 README.md                              |   0
 config/.gitkeep                        |   0
 config/php/laradock-php-ext-xdebug.ini |   0
 config/php/php-fpm.conf                |   0
 config/php/php.ini                     |   0
 docker-compose.skeleton.yml            |   0
 docker-compose.yml                     |   2 +-
 rootfs/var/www/html/index.php          |   0
 rootfs/var/www/html/laradock.jpg       | Bin
 tests/docker_run.sh                    |   0
 tests/docker_tests.sh                  |   0
 vendor/.gitkeep                        |   0
 19 files changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 .travis.yml
 mode change 100644 => 100755 Dockerfile
 mode change 100644 => 100755 Dockerfile.build
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 Makefile.am
 mode change 100644 => 100755 Makefile.in
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 config/.gitkeep
 mode change 100644 => 100755 config/php/laradock-php-ext-xdebug.ini
 mode change 100644 => 100755 config/php/php-fpm.conf
 mode change 100644 => 100755 config/php/php.ini
 mode change 100644 => 100755 docker-compose.skeleton.yml
 mode change 100644 => 100755 docker-compose.yml
 mode change 100644 => 100755 rootfs/var/www/html/index.php
 mode change 100644 => 100755 rootfs/var/www/html/laradock.jpg
 mode change 100644 => 100755 tests/docker_run.sh
 mode change 100644 => 100755 tests/docker_tests.sh
 mode change 100644 => 100755 vendor/.gitkeep

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.travis.yml b/.travis.yml
old mode 100644
new mode 100755
diff --git a/Dockerfile b/Dockerfile
old mode 100644
new mode 100755
index 35b20b2..3d82446
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=7.2.5
-ARG ALPINE_VERSION=3.7
+ARG ALPINE_VERSION=3.8
 FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION}
 
 # ================================================================================================
@@ -24,7 +24,7 @@ FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION}
 MAINTAINER "Laradock Team <mahmoud@zalt.me>"
 
 ENV PHP_VERSION=7.2.5 \
-    ALPINE_VERSION=3.7 \
+    ALPINE_VERSION=3.8 \
     XDEBUG_VERSION=2.6.0
 
 COPY ./docker-php-pecl-install /usr/local/bin/
diff --git a/Dockerfile.build b/Dockerfile.build
old mode 100644
new mode 100755
index 3ace282..2acc64c
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Makefile.am b/Makefile.am
old mode 100644
new mode 100755
diff --git a/Makefile.in b/Makefile.in
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/config/.gitkeep b/config/.gitkeep
old mode 100644
new mode 100755
diff --git a/config/php/laradock-php-ext-xdebug.ini b/config/php/laradock-php-ext-xdebug.ini
old mode 100644
new mode 100755
diff --git a/config/php/php-fpm.conf b/config/php/php-fpm.conf
old mode 100644
new mode 100755
diff --git a/config/php/php.ini b/config/php/php.ini
old mode 100644
new mode 100755
diff --git a/docker-compose.skeleton.yml b/docker-compose.skeleton.yml
old mode 100644
new mode 100755
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index 470cdb5..02d3b20
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - ./vendor/php-cs-fixer:/usr/local/bin/php-cs-fixer                           # vendor php-cs-fixer
       - ./data/laradock:/var/www/html                                               # volume for data
     environment:
-      - ALPINE_VERSION=3.7
+      - ALPINE_VERSION=3.8
       - PHP_VERSION=7.2.5
       - XDEBUG_VERSION=2.6.0
       - DEBUG=1
\ No newline at end of file
diff --git a/rootfs/var/www/html/index.php b/rootfs/var/www/html/index.php
old mode 100644
new mode 100755
diff --git a/rootfs/var/www/html/laradock.jpg b/rootfs/var/www/html/laradock.jpg
old mode 100644
new mode 100755
diff --git a/tests/docker_run.sh b/tests/docker_run.sh
old mode 100644
new mode 100755
diff --git a/tests/docker_tests.sh b/tests/docker_tests.sh
old mode 100644
new mode 100755
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
old mode 100644
new mode 100755

From d8c51143b690bfc32134ac9cfce79ab504fe9120 Mon Sep 17 00:00:00 2001
From: ZeroC0D3 Engineer <dfdenni0912@gmail.com>
Date: Fri, 14 Sep 2018 16:42:18 +0700
Subject: [PATCH 2/2] Update version for alpine 3.8 & php version 3.0

---
 .travis.yml        | 2 +-
 Dockerfile         | 4 ++--
 Dockerfile.build   | 4 ++--
 README.md          | 2 +-
 docker-compose.yml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90a4d9c..7c71e99 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ services:
 env:
   global:
     - COMMIT=${TRAVIS_COMMIT::8}
-    - REPO=dockerframework/phpfpm
+    - REPO=dockerframework/phpfpm:7.3
     - CGO_ENABLED=0
     - GOOS=linux
     - GOARCH=amd64
diff --git a/Dockerfile b/Dockerfile
index 3d82446..b98362e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=7.2.5
+ARG PHP_VERSION=7.3.0beta3
 ARG ALPINE_VERSION=3.8
 FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION}
 
@@ -23,7 +23,7 @@ FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION}
 
 MAINTAINER "Laradock Team <mahmoud@zalt.me>"
 
-ENV PHP_VERSION=7.2.5 \
+ENV PHP_VERSION=7.3.0beta3 \
     ALPINE_VERSION=3.8 \
     XDEBUG_VERSION=2.6.0
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 2acc64c..291b2e1 100755
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -56,8 +56,8 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
 
-ENV PHP_VERSION 7.2.5
-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"
+ENV PHP_VERSION 7.3.0beta3
+ENV PHP_URL="https://secure.php.net/get/php-7.3.0beta3.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.3.0beta3.tar.xz.asc/from/this/mirror"
 ENV PHP_SHA256="af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2" PHP_MD5=""
 
 RUN set -xe; \
diff --git a/README.md b/README.md
index fc70afe..573033b 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # PHPFpm Container
 PHPFpm Container of Docker Framework
 
-[![Build Status](https://travis-ci.org/dockerframework/phpfpm.svg?branch=master)](https://travis-ci.org/dockerframework/phpfpm) [![](https://images.microbadger.com/badges/image/dockerframework/phpfpm:latest.svg)](https://microbadger.com/images/dockerframework/phpfpm:latest "Layers") [![](https://images.microbadger.com/badges/version/dockerframework/phpfpm:latest.svg)](https://microbadger.com/images/dockerframework/phpfpm:latest "Version") [![GitHub issues](https://img.shields.io/github/issues/dockerframework/phpfpm.svg)](https://github.com/dockerframework/phpfpm/issues) [![GitHub forks](https://img.shields.io/github/forks/dockerframework/phpfpm.svg)](https://github.com/dockerframework/phpfpm/network) [![GitHub stars](https://img.shields.io/github/stars/dockerframework/phpfpm.svg)](https://github.com/dockerframework/phpfpm/stargazers) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/dockerframework/phpfpm/master/LICENSE)
+[![Build Status](https://travis-ci.org/dockerframework/phpfpm.svg?branch=master)](https://travis-ci.org/dockerframework/phpfpm) [![](https://images.microbadger.com/badges/image/dockerframework/phpfpm:7.3.svg)](https://microbadger.com/images/dockerframework/phpfpm:7.3 "Layers") [![](https://images.microbadger.com/badges/version/dockerframework/phpfpm:7.3.svg)](https://microbadger.com/images/dockerframework/phpfpm:7.3 "Version") [![GitHub issues](https://img.shields.io/github/issues/dockerframework/phpfpm.svg)](https://github.com/dockerframework/phpfpm/issues) [![GitHub forks](https://img.shields.io/github/forks/dockerframework/phpfpm.svg)](https://github.com/dockerframework/phpfpm/network) [![GitHub stars](https://img.shields.io/github/stars/dockerframework/phpfpm.svg)](https://github.com/dockerframework/phpfpm/stargazers) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/dockerframework/phpfpm/master/LICENSE)
diff --git a/docker-compose.yml b/docker-compose.yml
index 02d3b20..febe6be 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,6 @@ services:
       - ./data/laradock:/var/www/html                                               # volume for data
     environment:
       - ALPINE_VERSION=3.8
-      - PHP_VERSION=7.2.5
+      - PHP_VERSION=7.3.0beta3
       - XDEBUG_VERSION=2.6.0
       - DEBUG=1
\ No newline at end of file
