Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Disable cloud debugger by default (#89)
  • Loading branch information
shantuo committed May 23, 2017
1 parent 49cb5c9 commit 1b7047c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 21 deletions.
6 changes: 1 addition & 5 deletions runtime-builder/Dockerfile
Expand Up @@ -40,10 +40,6 @@ RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.
rm /tmp/go.tar.gz /tmp/go${GO_VERSION}.sha256

COPY go-build.sh /usr/local/bin/
COPY go-run.sh /usr/local/bin/
RUN chmod 755 /usr/local/bin/go-build.sh /usr/local/bin/go-run.sh

RUN curl -sSL https://storage.googleapis.com/cloud-debugger/compute-go/go-cloud-debug -o /usr/local/bin/go-cloud-debug && \
chmod 755 /usr/local/bin/go-cloud-debug
RUN chmod 755 /usr/local/bin/go-build.sh

ENTRYPOINT ["go-build.sh"]
5 changes: 1 addition & 4 deletions runtime-builder/go-build.sh
Expand Up @@ -35,9 +35,6 @@ find . -mindepth 1 -maxdepth 1 ! -name "${staging}" ! -name "$(basename $GOPATH)

# Create a bin/ directory containing all the binaries needed in the final image.
mkdir bin
mv /usr/local/bin/go-run.sh "${workspace}"/bin/
mv /usr/local/bin/go-cloud-debug "${workspace}"/bin/

cd "${staging}"
go build -o "${workspace}"/bin/app -tags appenginevm

Expand All @@ -55,5 +52,5 @@ COPY bin/ /usr/local/bin/
COPY app/ /app/
WORKDIR /app
ENTRYPOINT ["go-run.sh", "/usr/local/bin/app"]
ENTRYPOINT ["/usr/local/bin/app"]
EOF
12 changes: 0 additions & 12 deletions runtime-builder/tests/structure/test_config.yaml
Expand Up @@ -12,18 +12,6 @@ fileExistenceTests:
shouldExist: true
permissions: '-rwxr-xr-x'

- name: 'Go Run Script'
path: '/usr/local/bin/go-run.sh'
isDirectory: false
shouldExist: true
permissions: '-rwxr-xr-x'

- name: 'Go Debugger Agent'
path: '/usr/local/bin/go-cloud-debug'
isDirectory: false
shouldExist: true
permissions: '-rwxr-xr-x'

licenseTests:
- debian: true
files: []

0 comments on commit 1b7047c

Please sign in to comment.