From f28679e5f4744eee1f4f4ce3160580d8c95e3290 Mon Sep 17 00:00:00 2001
From: Masaki Muranaka <monaka@monami-ya.jp>
Date: Thu, 15 Nov 2018 15:46:15 +0900
Subject: [PATCH] Fix issue #218.

It should not add GAE related files into `eclipse/php` image.
Use `eclipse/php:gae` instead.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.jp>
---
 recipes/php/Dockerfile     |  8 --------
 recipes/php/gae/Dockerfile | 13 +++++++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/recipes/php/Dockerfile b/recipes/php/Dockerfile
index 1da50c76..955a13d8 100644
--- a/recipes/php/Dockerfile
+++ b/recipes/php/Dockerfile
@@ -87,18 +87,10 @@ RUN mkdir -p ${HOME}/che/ls-php/php-language-server && \
     rm -rf vendor && \
     sudo chgrp -R 0 ${HOME}/che && \
     sudo chmod -R g+rwX ${HOME}/che
-ENV GAE_VERSION="1.9.70"
 RUN sudo apt-get update && \
     sudo apt-get install --no-install-recommends -y -q build-essential python2.7 python2.7-dev python-pip php-bcmath && \
     sudo pip install -U pip && \
     sudo pip install virtualenv
-RUN cd /home/user/ && wget -q https://storage.googleapis.com/appengine-sdks/featured/google_appengine_${GAE_VERSION}.zip && \
-    unzip -q google_appengine_${GAE_VERSION}.zip && \
-    rm google_appengine_${GAE_VERSION}.zip && \
-    for f in "/home/user/google_appengine"; do \
-      sudo chgrp -R 0 ${f} && \
-      sudo chmod -R g+rwX ${f}; \
-    done
 EXPOSE 8080 8000
 
 # label is used in Servers tab to display mapped port for Apache process on 80 port in the container
diff --git a/recipes/php/gae/Dockerfile b/recipes/php/gae/Dockerfile
index 11d27f3e..844d2276 100644
--- a/recipes/php/gae/Dockerfile
+++ b/recipes/php/gae/Dockerfile
@@ -10,16 +10,17 @@
 
 FROM eclipse/php
 ENV GAE /home/user/google_appengine
+ENV GAE_VERSION="1.9.70"
 
 RUN sudo apt-get update && \
     sudo apt-get install --no-install-recommends -y -q build-essential python2.7 python2.7-dev python-pip php-bcmath && \
     sudo pip install -U pip && \
     sudo pip install virtualenv
-RUN cd /home/user/ && wget -q https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.40.zip && \
-    unzip -q google_appengine_1.9.40.zip && \
-    rm google_appengine_1.9.40.zip && \
-    for f in "/home/user"; do \
-    sudo chgrp -R 0 ${f} && \
-    sudo chmod -R g+rwX ${f}; \
+RUN cd /home/user/ && wget -q https://storage.googleapis.com/appengine-sdks/featured/google_appengine_${GAE_VERSION}.zip && \
+    unzip -q google_appengine_${GAE_VERSION}.zip && \
+    rm google_appengine_${GAE_VERSION}.zip && \
+    for f in "/home/user/google_appengine"; do \
+      sudo chgrp -R 0 ${f} && \
+      sudo chmod -R g+rwX ${f}; \
     done
 EXPOSE 8080 8000