From 46b52f258d7c031306a4f742eee88375ddff4b56 Mon Sep 17 00:00:00 2001 From: Wesley Wong Date: Mon, 27 Mar 2017 14:32:52 -0700 Subject: [PATCH 1/2] Fixes the Endpoints getting-started sample. The Dockerfile and openapi.yaml cannot be in the appengine directory. These have been moved out into their own directories. Also, the jetty user needs access to the war file. The Dockerfile has been updated accordingly. --- .../getting-started/src/main/{appengine => docker}/Dockerfile | 1 + .../getting-started/src/main/{appengine => openapi}/openapi.yaml | 0 2 files changed, 1 insertion(+) rename endpoints/getting-started/src/main/{appengine => docker}/Dockerfile (67%) rename endpoints/getting-started/src/main/{appengine => openapi}/openapi.yaml (100%) diff --git a/endpoints/getting-started/src/main/appengine/Dockerfile b/endpoints/getting-started/src/main/docker/Dockerfile similarity index 67% rename from endpoints/getting-started/src/main/appengine/Dockerfile rename to endpoints/getting-started/src/main/docker/Dockerfile index 063636ed556..a049a90f511 100644 --- a/endpoints/getting-started/src/main/appengine/Dockerfile +++ b/endpoints/getting-started/src/main/docker/Dockerfile @@ -2,3 +2,4 @@ FROM gcr.io/google_appengine/jetty9 ADD endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war ADD . /app +RUN chown jetty:jetty $JETTY_BASE/webapps/root.war diff --git a/endpoints/getting-started/src/main/appengine/openapi.yaml b/endpoints/getting-started/src/main/openapi/openapi.yaml similarity index 100% rename from endpoints/getting-started/src/main/appengine/openapi.yaml rename to endpoints/getting-started/src/main/openapi/openapi.yaml From 9b5cd96f2bc39ff339a8fb024a4c85e954d7a958 Mon Sep 17 00:00:00 2001 From: Wesley Wong Date: Wed, 29 Mar 2017 12:13:41 -0700 Subject: [PATCH 2/2] Move openapi.yaml to the root. --- endpoints/getting-started/{src/main/openapi => }/openapi.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename endpoints/getting-started/{src/main/openapi => }/openapi.yaml (100%) diff --git a/endpoints/getting-started/src/main/openapi/openapi.yaml b/endpoints/getting-started/openapi.yaml similarity index 100% rename from endpoints/getting-started/src/main/openapi/openapi.yaml rename to endpoints/getting-started/openapi.yaml