From 47a726398b055cf77df38addf90a1a388a53b2c7 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <mail@abhinavg.net>
Date: Sun, 18 Dec 2022 23:01:01 -0800
Subject: Delete unused Docker infrastructure (#60)

This was all added back when these tests were running on Travis CI
and attempted to create an isolated build of sally.

This is all no longer necessary because GitHub Actions and Go modules
provide enough isolation.
---
 .dockerignore      |  1 -
 Dockerfile         | 12 ------------
 Dockerfile.scratch |  6 ------
 Makefile           | 27 ---------------------------
 4 files changed, 46 deletions(-)
 delete mode 100644 .dockerignore
 delete mode 100644 Dockerfile
 delete mode 100644 Dockerfile.scratch

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"]
diff --git a/Makefile b/Makefile
index e711e05..b938911 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3