From e7d26d1671636e36562bcbcbe4d3aca9dec97601 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 25 Apr 2022 23:09:32 +0000 Subject: [PATCH 1/8] feat: add dockerfile and docker-compose --- Dockerfile | 5 +++++ docker-compose.yaml | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000..6aaef16a9630c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM alpine + +ADD ./dist/coder-linux_linux_amd64_v1/coder /opt/coder + +ENTRYPOINT [ "/opt/coder", "server" ] diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000000000..53367be72f8bc --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,21 @@ +version: "3.9" +services: + coder: + build: . + ports: + - "7080:3000" + environment: + CODER_PG_CONNECTION_URL: "postgresql://username:password@database/coder?sslmode=disable" + CODER_ACCESS_URL: "http://localhost:7080" + depends_on: + - database + database: + image: "postgres:latest" + environment: + POSTGRES_USER: username # The PostgreSQL user (useful to connect to the database) + POSTGRES_PASSWORD: password # The PostgreSQL password (useful to connect to the database) + POSTGRES_DB: coder # The PostgreSQL default database (automatically created at first launch) + volumes: + - pgdata:/var/lib/postgresql/data +volumes: + pgdata: From f373a27da204e176c1748b011e26c12b214264e8 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 11 May 2022 16:19:37 +0000 Subject: [PATCH 2/8] build docker images on release --- .goreleaser.yaml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 29bfb0341c1f5..8e08f8c3a7dac 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -107,6 +107,54 @@ nfpms: - src: coder.service dst: /usr/lib/systemd/system/coder.service +dockers: + - image_templates: ["ghcr.io/coder/coder:{{ .Tag }}-amd64"] + id: coder-linux + dockerfile: Dockerfile + use: buildx + build_flag_templates: + - --platform=linux/amd64 + - --label=org.opencontainers.image.title=Coder + - --label=org.opencontainers.image.description=A tool for provisioning self-hosted development environments with Terraform. + - --label=org.opencontainers.image.url=https://github.com/coder/coder + - --label=org.opencontainers.image.source=https://github.com/coder/coder + - --label=org.opencontainers.image.version={{ .Version }} + - --label=org.opencontainers.image.revision={{ .FullCommit }} + - --label=org.opencontainers.image.licenses=MIT + - image_templates: ["ghcr.io/coder/coder:{{ .Tag }}-arm64"] + goarch: arm64 + dockerfile: Dockerfile + use: buildx + build_flag_templates: + - --platform=linux/arm64/v8 + - --label=org.opencontainers.image.title=coder + - --label=org.opencontainers.image.description=A tool for provisioning self-hosted development environments with Terraform. + - --label=org.opencontainers.image.url=https://github.com/coder/coder + - --label=org.opencontainers.image.source=https://github.com/coder/coder + - --label=org.opencontainers.image.version={{ .Tag }} + - --label=org.opencontainers.image.revision={{ .FullCommit }} + - --label=org.opencontainers.image.licenses=AGPL-3.0 + - image_templates: ["ghcr.io/coder/coder:{{ .Tag }}-armv7"] + goarch: arm + goarm: "7" + dockerfile: Dockerfile + use: buildx + build_flag_templates: + - --platform=linux/arm/v7 + - --label=org.opencontainers.image.title=Coder + - --label=org.opencontainers.image.description=A tool for provisioning self-hosted development environments with Terraform. + - --label=org.opencontainers.image.url=https://github.com/coder/coder + - --label=org.opencontainers.image.source=https://github.com/coder/coder + - --label=org.opencontainers.image.version={{ .Tag }} + - --label=org.opencontainers.image.revision={{ .FullCommit }} + - --label=org.opencontainers.image.licenses=AGPL-3.0 +docker_manifests: + - name_template: ghcr.io/coder/coder:{{ .Tag }} + image_templates: + - ghcr.io/coder/coder:{{ .Tag }}-amd64 + - ghcr.io/coder/coder:{{ .Tag }}-arm64 + - ghcr.io/coder/coder:{{ .Tag }}-armv7 + release: ids: [coder-linux, coder-darwin, coder-windows, packages] diff --git a/Dockerfile b/Dockerfile index 6aaef16a9630c..2996899aca4c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine -ADD ./dist/coder-linux_linux_amd64_v1/coder /opt/coder +ADD coder /opt/coder ENTRYPOINT [ "/opt/coder", "server" ] From 9bc38cc082d715587fa02c860d248a479a5381cf Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 11 May 2022 16:39:02 +0000 Subject: [PATCH 3/8] add Docker dependencies to release.yaml --- .github/workflows/release.yaml | 17 +++++++++++++++++ Dockerfile | 1 + 2 files changed, 18 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e025aa2a51e11..0dc87ba8fc873 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,10 +6,27 @@ on: jobs: goreleaser: runs-on: macos-latest + env: + # Necessary for Docker manifest + DOCKER_CLI_EXPERIMENTAL: "enabled" steps: + # Docker is not included on macos-latest + - uses: docker-practice/actions-setup-docker@v1 + - uses: actions/checkout@v3 with: fetch-depth: 0 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Docker Login + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/setup-go@v3 with: go-version: "~1.18" diff --git a/Dockerfile b/Dockerfile index 2996899aca4c9..8bbcbe848837f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM alpine +# Generated by goreleaser on `goreleaser release` ADD coder /opt/coder ENTRYPOINT [ "/opt/coder", "server" ] From 2d91857faa00583c924477f56e893b71c41e5230 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 11 May 2022 16:40:20 +0000 Subject: [PATCH 4/8] remove docker compose for now --- docker-compose.yaml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 53367be72f8bc..0000000000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3.9" -services: - coder: - build: . - ports: - - "7080:3000" - environment: - CODER_PG_CONNECTION_URL: "postgresql://username:password@database/coder?sslmode=disable" - CODER_ACCESS_URL: "http://localhost:7080" - depends_on: - - database - database: - image: "postgres:latest" - environment: - POSTGRES_USER: username # The PostgreSQL user (useful to connect to the database) - POSTGRES_PASSWORD: password # The PostgreSQL password (useful to connect to the database) - POSTGRES_DB: coder # The PostgreSQL default database (automatically created at first launch) - volumes: - - pgdata:/var/lib/postgresql/data -volumes: - pgdata: From 741d9cdb77cbecfbca57c54aff31d780650df938 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 11 May 2022 19:19:29 +0000 Subject: [PATCH 5/8] fix license mismatch --- .goreleaser.yaml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 8e08f8c3a7dac..36ad5247f38d7 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -28,8 +28,7 @@ before: builds: - id: coder-slim dir: cmd/coder - ldflags: - ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] + ldflags: ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] env: [CGO_ENABLED=0] goos: [darwin, linux, windows] goarch: [amd64, arm, arm64] @@ -37,9 +36,9 @@ builds: # Only build arm 7 for Linux ignore: - goos: windows - goarm: '7' + goarm: "7" - goos: darwin - goarm: '7' + goarm: "7" hooks: # The "trimprefix" appends ".exe" on Windows. post: | @@ -48,8 +47,7 @@ builds: - id: coder-linux dir: cmd/coder flags: [-tags=embed] - ldflags: - ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] + ldflags: ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] env: [CGO_ENABLED=0] goos: [linux] goarch: [amd64, arm, arm64] @@ -58,8 +56,7 @@ builds: - id: coder-windows dir: cmd/coder flags: [-tags=embed] - ldflags: - ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] + ldflags: ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] env: [CGO_ENABLED=0] goos: [windows] goarch: [amd64, arm64] @@ -67,15 +64,14 @@ builds: - id: coder-darwin dir: cmd/coder flags: [-tags=embed] - ldflags: - ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] + ldflags: ["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"] env: [CGO_ENABLED=0] goos: [darwin] goarch: [amd64, arm64] hooks: # This signs the binary that will be located inside the zip. # MacOS requires the binary to be signed for notarization. - # + # # If it doesn't successfully sign, the zip sign step will error. post: | sh -c 'codesign -s {{.Env.AC_APPLICATION_IDENTITY}} -f -v --timestamp --options runtime {{.Path}} || true' @@ -120,7 +116,7 @@ dockers: - --label=org.opencontainers.image.source=https://github.com/coder/coder - --label=org.opencontainers.image.version={{ .Version }} - --label=org.opencontainers.image.revision={{ .FullCommit }} - - --label=org.opencontainers.image.licenses=MIT + - --label=org.opencontainers.image.licenses=AGPL-3.0 - image_templates: ["ghcr.io/coder/coder:{{ .Tag }}-arm64"] goarch: arm64 dockerfile: Dockerfile From 801e5b5134f558bf880a27d6a0807ea8f11d138b Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 12 May 2022 14:31:37 +0000 Subject: [PATCH 6/8] add docker-compose --- docker-compose.yaml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000000000..f4445657f5986 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,31 @@ +version: "3.9" +services: + coder: + image: ghcr.io/coder/coder:v${CODER_VERSION:-0.5.5}-${ARCH:-amd64} + ports: + - "7080:7080" + environment: + CODER_PG_CONNECTION_URL: "postgresql://username:password@database/coder?sslmode=disable" + CODER_ADDRESS: "0.0.0.0:7080" + depends_on: + database: + condition: service_healthy + database: + image: "postgres:14.2" + environment: + POSTGRES_USER: ${POSTGRES_USER:-username} # The PostgreSQL user (useful to connect to the database) + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password} # The PostgreSQL password (useful to connect to the database) + POSTGRES_DB: ${POSTGRES_DB:-coder} # The PostgreSQL default database (automatically created at first launch) + volumes: + - pgdata:/var/lib/postgresql/data # Use "docker volume rm coder_pgdata" to reset Coder + healthcheck: + test: + [ + "CMD-SHELL", + "pg_isready -U ${POSTGRES_USER:-username} -d ${POSTGRES_DB:-coder}", + ] + interval: 5s + timeout: 5s + retries: 5 +volumes: + pgdata: From 8cf29f30d3aec888ea62f84630b4343cc7120c6e Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 12 May 2022 14:37:13 +0000 Subject: [PATCH 7/8] rename volume --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f4445657f5986..f512c5ca69b3e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,7 +17,7 @@ services: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password} # The PostgreSQL password (useful to connect to the database) POSTGRES_DB: ${POSTGRES_DB:-coder} # The PostgreSQL default database (automatically created at first launch) volumes: - - pgdata:/var/lib/postgresql/data # Use "docker volume rm coder_pgdata" to reset Coder + - coder_data:/var/lib/postgresql/data # Use "docker volume rm coder_coder_data" to reset Coder healthcheck: test: [ @@ -28,4 +28,4 @@ services: timeout: 5s retries: 5 volumes: - pgdata: + coder_data: From 0df2fe6f1ca45702e55610e8992c7acae63d2b07 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 12 May 2022 17:48:05 +0000 Subject: [PATCH 8/8] add WF dispatch for debugging --- .github/workflows/release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0dc87ba8fc873..e289858b1de03 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,6 +3,8 @@ on: push: tags: - "v*" + workflow_dispatch: + jobs: goreleaser: runs-on: macos-latest