diff options
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 12 | ||||
| -rw-r--r-- | Dockerfile.scratch | 6 | ||||
| -rw-r--r-- | Makefile | 27 |
4 files changed, 0 insertions, 46 deletions
diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 22d0d82..0000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -vendor diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1198370..0000000 --- a/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.18 - -EXPOSE 8080 -RUN \ - curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz && \ - tar --strip-components=1 -xvzf docker-latest.tgz -C /usr/local/bin -ENV GO111MODULE=on -RUN mkdir -p /go/src/go.uber.org/sally -WORKDIR /go/src/go.uber.org/sally -ADD . /go/src/go.uber.org/sally/ -RUN go mod vendor -CMD ["make", "run"] diff --git a/Dockerfile.scratch b/Dockerfile.scratch deleted file mode 100644 index f78f304..0000000 --- a/Dockerfile.scratch +++ /dev/null @@ -1,6 +0,0 @@ -FROM scratch - -EXPOSE 8080 -ADD sally.yaml / -ADD _tmp/sally / -ENTRYPOINT ["/sally"] @@ -40,33 +40,6 @@ cover: clean: rm -rf _tmp -.PHONY: docker-build-dev -docker-build-dev: - docker build -t uber/sally-dev . - -.PHONY: docker-test -docker-test: docker-build-dev - docker run uber/sally-dev make test - -.PHONY: docker-build-internal -docker-build-internal: - rm -rf _tmp - mkdir -p _tmp - CGO_ENABLED=0 go build -a -o _tmp/sally . - docker build -t uber/sally -f Dockerfile.scratch . - -.PHONY: docker-build -docker-build: docker-build-dev - docker run -v /var/run/docker.sock:/var/run/docker.sock uber/sally-dev make docker-build-internal - -.PHONY: docker-launch-dev -docker-launch-dev: docker-build-dev - docker run -p 8080:8080 uber/sally-dev - -.PHONY: docker-launch -docker-launch: docker-build - docker run -p 8080:8080 uber/sally - .PHONY: install run: install sally |