Merge pull request #1 from vulcanize/cicd

fix CI/CD. rename master to main branch

.github/workflows/on-master.yaml

@@ -3,7 +3,7 @@ name: Docker Compose Build
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:

Dockerfile

@@ -0,0 +1,20 @@
+FROM golang:1.13-alpine as builder
+
+RUN apk --update --no-cache add make git g++ linux-headers
+# DEBUG
+RUN apk add busybox-extras
+
+# Get and build gap-filler
+ADD . /go/src/github.com/vulcanize/gap-filler
+WORKDIR /go/src/github.com/vulcanize/gap-filler
+RUN make linux
+
+# app container
+FROM alpine
+
+# keep binaries immutable
+COPY --from=builder /go/src/github.com/vulcanize/gap-filler/build/gap-filler-linux gap-filler
+
+EXPOSE 8080
+
+ENTRYPOINT ["/app/gap-filler"]

Makefile

@@ -12,7 +12,7 @@ endif
 ifneq ($(shell git status --porcelain),)
     VERSION := $(VERSION)-dirty
 endif
-LDFLAGS := -ldflags "-w -s -X 'github.com/vulcanize/gap-filler-service/cmd.version=$(VERSION)'"
+LDFLAGS := -ldflags "-w -s -X 'github.com/vulcanize/gap-filler/cmd.version=$(VERSION)'"
 
 all: clean test linux darwin windows
 
@@ -26,15 +26,15 @@ test:
 
 linux:
 	if [ ! -d "build" ]; then mkdir "build"; fi
-	GOOS=linux GOARCH=amd64 go build ${LDFLAGS} -o build/gapfiller-linux-${COMMIT}
+	GOOS=linux GOARCH=amd64 go build ${LDFLAGS} -o build/gap-filler-linux
 
 darwin:
 	if [ ! -d "build" ]; then mkdir "build"; fi
-	GOOS=darwin GOARCH=amd64 go build ${LDFLAGS} -o build/gapfiller-darwin-${COMMIT}
+	GOOS=darwin GOARCH=amd64 go build ${LDFLAGS} -o build/gapfiller-darwin
 
 windows:
 	if [ ! -d "build" ]; then mkdir "build"; fi
-	GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o build/gapfiller-windows-${COMMIT}
+	GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o build/gapfiller-windows
 
 ## Build docker image
 .PHONY: docker-build