Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bringing back older SDK style so we can utilize the new go1.8 version #13

Merged
merged 2 commits into from
Jun 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down