Skip to content

Commit

Permalink
Remove docker files (#2456)
Browse files Browse the repository at this point in the history
* Remove docker files

* Update docker/README.md

Co-authored-by: Alex Shtin <[email protected]>

* address comments

* update docker readme

* Update develop/buildkite/pipeline.yml

Co-authored-by: Alex Shtin <[email protected]>

* Update README.md

Co-authored-by: Alex Shtin <[email protected]>

Co-authored-by: Alex Shtin <[email protected]>
Co-authored-by: Alex Shtin <[email protected]>
  • Loading branch information
3 people authored Mar 21, 2022
1 parent cd67ba3 commit b7100ae
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 771 deletions.
81 changes: 0 additions & 81 deletions Dockerfile

This file was deleted.

55 changes: 1 addition & 54 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Install all tools and builds binaries.
install: update-tools bins

# Rebuild binaries (used by Dockerfile).
# Rebuild binaries (used for docker builds).
bins: clean-bins temporal-server tctl plugins temporal-cassandra-tool temporal-sql-tool

# Install all tools, recompile proto files, run all possible checks and tests (long but comprehensive).
Expand Down Expand Up @@ -38,10 +38,6 @@ PERSISTENCE_DRIVER ?= cassandra
TEMPORAL_DB ?= temporal
VISIBILITY_DB ?= temporal_visibility

DOCKER_IMAGE_TAG ?= test
# Pass "registry" to automatically push image to the docker hub.
DOCKER_BUILDX_OUTPUT ?= image

ifdef TEST_TAG
override TEST_TAG := -tags $(TEST_TAG)
endif
Expand Down Expand Up @@ -457,55 +453,6 @@ fossa-test:

build-fossa: bins fossa-analyze fossa-delay fossa-test

##### Docker #####
docker-server:
@printf $(COLOR) "Building docker image temporalio/server:$(DOCKER_IMAGE_TAG)..."
docker build . -t temporalio/server:$(DOCKER_IMAGE_TAG) --target temporal-server

docker-auto-setup:
@printf $(COLOR) "Build docker image temporalio/auto-setup:$(DOCKER_IMAGE_TAG)..."
docker build . -t temporalio/auto-setup:$(DOCKER_IMAGE_TAG) --target temporal-auto-setup

docker-tctl:
@printf $(COLOR) "Build docker image temporalio/tctl:$(DOCKER_IMAGE_TAG)..."
docker build . -t temporalio/tctl:$(DOCKER_IMAGE_TAG) --target temporal-tctl

docker-admin-tools:
@printf $(COLOR) "Build docker image temporalio/admin-tools:$(DOCKER_IMAGE_TAG)..."
docker build . -t temporalio/admin-tools:$(DOCKER_IMAGE_TAG) --target temporal-admin-tools

docker-buildx-container:
docker buildx create --name builder-x --driver docker-container --use

docker-server-x:
@printf $(COLOR) "Building cross-platform docker image temporalio/server:$(DOCKER_IMAGE_TAG)..."
docker buildx build . -t temporalio/server:$(DOCKER_IMAGE_TAG) --platform linux/amd64,linux/arm64 --output type=$(DOCKER_BUILDX_OUTPUT) --target temporal-server

docker-auto-setup-x:
@printf $(COLOR) "Build cross-platform docker image temporalio/auto-setup:$(DOCKER_IMAGE_TAG)..."
docker buildx build . -t temporalio/auto-setup:$(DOCKER_IMAGE_TAG) --platform linux/amd64,linux/arm64 --output type=$(DOCKER_BUILDX_OUTPUT) --target temporal-auto-setup

docker-tctl-x:
@printf $(COLOR) "Build cross-platform docker image temporalio/tctl:$(DOCKER_IMAGE_TAG)..."
docker buildx build . -t temporalio/tctl:$(DOCKER_IMAGE_TAG) --platform linux/amd64,linux/arm64 --output type=$(DOCKER_BUILDX_OUTPUT) --target temporal-tctl

docker-admin-tools-x:
@printf $(COLOR) "Build cross-platform docker image temporalio/admin-tools:$(DOCKER_IMAGE_TAG)..."
docker buildx build . -t temporalio/admin-tools:$(DOCKER_IMAGE_TAG) --platform linux/amd64,linux/arm64 --output type=$(DOCKER_BUILDX_OUTPUT) --target temporal-admin-tools

##### goreleaser #####
goreleaser-install:
@printf $(COLOR) "Install/update goreleaser tool..."
@go install github.com/goreleaser/goreleaser@latest

goreleaser-build:
@printf $(COLOR) "Build release binaries from current commit..."
@goreleaser release --snapshot --rm-dist

goreleaser-release:
@printf $(COLOR) "Build and publish release binaries to the latest release tag..."
@goreleaser release --rm-dist

##### Grafana #####
update-dashboards:
@printf $(COLOR) "Update dashboards submodule from remote..."
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ docker-compose up

Refer to Temporal [docker-compose](https://github.com/temporalio/docker-compose) repo for more advanced options.

For more details on Docker images refer to [docker-builds](https://github.com/temporalio/docker-builds) repo.

### Run the Samples

Clone or download samples for [Go](https://github.com/temporalio/samples-go) or [Java](https://github.com/temporalio/samples-java) and run them with the local Temporal server.
Expand Down
8 changes: 6 additions & 2 deletions develop/buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:

- wait

- label: ":docker: build docker images"
- label: ":golang: build without cgo"
agents:
queue: "default"
docker: "*"
command: "docker build ."
command: "CGO_ENABLED=0 make bins"
plugins:
- docker-compose#v3.8.0:
run: build
config: ./develop/buildkite/docker-compose.yml

- label: ":golang: unit test"
agents:
Expand Down
58 changes: 0 additions & 58 deletions docker/README.md

This file was deleted.

Loading

0 comments on commit b7100ae

Please sign in to comment.