Fix Dockerfile, clean up *ignore

.dockerignore

@@ -0,0 +1,7 @@
+.git
+.github
+
+upl
+
+web/node_modules
+web/assets

.github/workflows/build.yml

@@ -48,7 +48,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Vet code
-      run: go vet ./...
+      run: make vet
 
   format:
     name: Format

.gitignore

@@ -1,5 +1,4 @@
-node_modules
-web/assets
 upl
 
-.env
+web/node_modules
+web/assets

Dockerfile

@@ -12,7 +12,7 @@ FROM golang:1.16-alpine3.13 as build
 RUN apk add \
 	make
 WORKDIR /src
-COPY --from=build-web . .
+COPY --from=build-web /src .
 
 ARG CGO_ENABLED=0
 RUN make TAGS=production
@@ -20,6 +20,6 @@ RUN make TAGS=production
 FROM scratch
 
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --from=build upl /upl
+COPY --from=build /src/upl /upl
 
-RUN ["/upl"]
+CMD ["/upl"]

Makefile

@@ -18,6 +18,9 @@ upl: *.go web/*.tmpl web
 .PHONY: test
 test: web
 	$(GO) test -cover -bench=. -v ./...
+.PHONY: vet
+vet: web
+	$(GO) vet ./...
 
 
 .PHONY: web