From 96721166b27ca63cebf0b177fe79efe831147433 Mon Sep 17 00:00:00 2001
From: Chingis Sandanov <chingis@wodby.com>
Date: Fri, 9 Feb 2018 15:43:12 +0700
Subject: [PATCH] wodby is now default user
 https://github.com/wodby/php/issues/22

---
 .travis.yml | 18 +++++++++++-------
 Dockerfile  |  6 +++---
 README.md   |  8 ++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7411626..d7dd8d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,19 +7,19 @@ env:
   global:
     - LATEST_TAG=7.2
   matrix:
-    - TAG=7.2 PHP_VER=7.2
+    - TAG=7.2 PHP_VER=7.2 EXTRA_TAG=7
     - TAG=7.1 PHP_VER=7.1
     - TAG=7.0 PHP_VER=7.0
-    - TAG=5.6 PHP_VER=5.6
-    - TAG=7.2-dev PHP_VER=7.2 PHP_DEV=1
+    - TAG=5.6 PHP_VER=5.6 EXTRA_TAG=5
+    - TAG=7.2-dev PHP_VER=7.2 PHP_DEV=1 EXTRA_TAG=7-dev
     - TAG=7.1-dev PHP_VER=7.1 PHP_DEV=1
     - TAG=7.0-dev PHP_VER=7.0 PHP_DEV=1
-    - TAG=5.6-dev PHP_VER=5.6 PHP_DEV=1
+    - TAG=5.6-dev PHP_VER=5.6 PHP_DEV=1 EXTRA_TAG=5-dev
 
-script:
-  - make && make test
+script: |
+  make
+  make test
 
-after_success: |
   if [[ "${TRAVIS_PULL_REQUEST}" == "false" && ("${TRAVIS_BRANCH}" == "master"  || -n "${TRAVIS_TAG}") ]]; then
     docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
 
@@ -29,6 +29,10 @@ after_success: |
 
     make release
 
+    if [[ -n "${EXTRA_TAG}" ]]; then
+      make release TAG="${EXTRA_TAG}"
+    fi
+
     if [[ "${TAG}" == "${LATEST_TAG}" ]]; then
       make release TAG="latest"
     fi
diff --git a/Dockerfile b/Dockerfile
index 6d88d81..c8ada97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,12 +6,12 @@ USER root
 
 RUN set -ex; \
     \
-    su-exec www-data composer global require wp-cli/wp-cli; \
-    su-exec www-data composer clear-cache; \
+    su-exec wodby composer global require wp-cli/wp-cli; \
+    su-exec wodby composer clear-cache; \
     \
     mv /usr/local/bin/actions.mk /usr/local/bin/php.mk
 
-USER www-data
+USER wodby
 
 COPY templates /etc/gotpl/
 COPY actions /usr/local/bin
diff --git a/README.md b/README.md
index e1439d9..f749bed 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,14 @@ Overview:
 
 Supported tags and respective `Dockerfile` links:
 
-* `7.2`, `latest` [_(Dockerfile)_]
+* `7`, `7.2`, `latest` [_(Dockerfile)_]
 * `7.1` [_(Dockerfile)_]
 * `7.0` [_(Dockerfile)_]
-* `5.6` [_(Dockerfile)_]
-* `7.2-dev` [_(Dockerfile)_]
+* `5`, `5.6` [_(Dockerfile)_]
+* `7-dev`, `7.2-dev` [_(Dockerfile)_]
 * `7.1-dev` [_(Dockerfile)_]
 * `7.0-dev` [_(Dockerfile)_]
-* `5.6-dev` [_(Dockerfile)_]
+* `5-dev`, `5.6-dev` [_(Dockerfile)_]
 
 For better reliability we additionally release images with stability tags (`wodby/wordpress-php:7.1-X.X.X`) which correspond to git tags. We **strongly recommend** using images only with stability tags.