Merge pull request #13 from NYTimes/go18

bringing back older SDK style so we can utilize the new go1.8 version
nytimes · Jun 28, 2017 · 9e43965 · 9e43965
2 parents 086c903 + 026ce0a
commit 9e43965
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM alpine:3.4
 
-ENV GOOGLE_CLOUD_SDK_VERSION=155.0.0
+ENV GOOGLE_CLOUD_SDK_VERSION=161.0.0
+ENV GOOGLE_APP_ENGINE_SDK_VERSION=1.9.55
 ENV CLOUDSDK_APP_RUNTIME_ROOT=/google-cloud-sdk/platform/ext-runtime/
 RUN apk add --no-cache curl python
 
@@ -13,6 +14,11 @@ RUN ./google-cloud-sdk/install.sh --quiet
 # Install the app engine SDK
 RUN ./google-cloud-sdk/bin/gcloud components install app-engine-go
 
+# Install the legacy app engine SDK
+RUN curl -fsSLo go_appengine_sdk_linux_amd64-$GOOGLE_APP_ENGINE_SDK_VERSION.zip https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-$GOOGLE_APP_ENGINE_SDK_VERSION.zip
+RUN unzip -q go_appengine_sdk_linux_amd64-$GOOGLE_APP_ENGINE_SDK_VERSION.zip
+RUN rm go_appengine_sdk_linux_amd64-$GOOGLE_APP_ENGINE_SDK_VERSION.zip
+
 # Clean up
 RUN rm -rf ./google-cloud-sdk/.install
 

diff --git a/main.go b/main.go
@@ -127,7 +127,7 @@ func wrapMain() error {
 	}
 
 	if vargs.AppCfgCmd == "" {
-		vargs.AppCfgCmd = "/google-cloud-sdk/platform/google_appengine/appcfg.py"
+		vargs.AppCfgCmd = "/go_appengine/appcfg.py"
 	}
 
 	// Trim whitespace, to forgive the vagaries of YAML parsing.