From 54af92792abaa06ce2ff2881d892a94d4dd7f91f Mon Sep 17 00:00:00 2001 From: David Wahler Date: Thu, 12 May 2022 21:37:46 +0000 Subject: [PATCH 1/3] chore: Add Cloud Run configuration for internal godoc hosting --- scripts/internal-docs/README.md | 3 +++ scripts/internal-docs/cloudbuild.yaml | 8 ++++++++ scripts/internal-docs/docker/Dockerfile | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100644 scripts/internal-docs/README.md create mode 100644 scripts/internal-docs/cloudbuild.yaml create mode 100644 scripts/internal-docs/docker/Dockerfile diff --git a/scripts/internal-docs/README.md b/scripts/internal-docs/README.md new file mode 100644 index 0000000000000..4806fba17b436 --- /dev/null +++ b/scripts/internal-docs/README.md @@ -0,0 +1,3 @@ +Configuration for automatically building and hosting an internal godoc site. +This will become obsolete once we make the repo public and can use +https://pkg.go.dev/. diff --git a/scripts/internal-docs/cloudbuild.yaml b/scripts/internal-docs/cloudbuild.yaml new file mode 100644 index 0000000000000..d53d13abcdac2 --- /dev/null +++ b/scripts/internal-docs/cloudbuild.yaml @@ -0,0 +1,8 @@ +steps: +- name: gcr.io/cloud-builders/docker + args: ['build', '-t', 'gcr.io/coder-devrel/internal-docs', '-f', 'scripts/internal-docs/docker/Dockerfile', '.'] +- name: gcr.io/cloud-builders/docker + args: ['push', 'gcr.io/coder-devrel/internal-docs'] +- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk' + entrypoint: gcloud + args: ['run', 'deploy', 'internal-docs', '--image', 'gcr.io/coder-devrel/internal-docs', '--region', 'us-central1'] diff --git a/scripts/internal-docs/docker/Dockerfile b/scripts/internal-docs/docker/Dockerfile new file mode 100644 index 0000000000000..25edb6b190b00 --- /dev/null +++ b/scripts/internal-docs/docker/Dockerfile @@ -0,0 +1,9 @@ +FROM golang:1.18-alpine + +RUN go install golang.org/x/tools/cmd/godoc@v0.1.10 + +WORKDIR /go/src/github.com/coder/coder +ADD . . + +EXPOSE 6060 +CMD godoc -http :6060 From 612c0e09e3917ddd4326848bfc4fa16408127e95 Mon Sep 17 00:00:00 2001 From: David Wahler Date: Thu, 12 May 2022 22:32:04 +0000 Subject: [PATCH 2/3] Switch to fork of golang.org/x/tools for better startup behavior --- scripts/internal-docs/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/internal-docs/docker/Dockerfile b/scripts/internal-docs/docker/Dockerfile index 25edb6b190b00..43603994a2f0f 100644 --- a/scripts/internal-docs/docker/Dockerfile +++ b/scripts/internal-docs/docker/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.18-alpine -RUN go install golang.org/x/tools/cmd/godoc@v0.1.10 +RUN go install github.com/dwahler/go-tools/cmd/godoc@v0.1.0 WORKDIR /go/src/github.com/coder/coder ADD . . From fa8b81948cbf540c5228c3bd34f342af63c502c9 Mon Sep 17 00:00:00 2001 From: David Wahler Date: Thu, 12 May 2022 22:52:46 +0000 Subject: [PATCH 3/3] Bump godoc version --- scripts/internal-docs/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/internal-docs/docker/Dockerfile b/scripts/internal-docs/docker/Dockerfile index 43603994a2f0f..32a06044ac7a0 100644 --- a/scripts/internal-docs/docker/Dockerfile +++ b/scripts/internal-docs/docker/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.18-alpine -RUN go install github.com/dwahler/go-tools/cmd/godoc@v0.1.0 +RUN go install github.com/dwahler/go-tools/cmd/godoc@v0.1.1 WORKDIR /go/src/github.com/coder/coder ADD . .