Add Makefile, bump linter version

.github/workflows/build.yml

@@ -7,7 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     steps:
@@ -19,12 +18,12 @@ jobs:
           go-version: '1.22'
 
       - name: Build
-        run: go build -v ./...
+        run: make
 
       - name: Lint
         run: |
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
-          golangci-lint run --fix=false
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
+          make lint
 
       - name: Test
         run: go test -v ./...

.gitignore

@@ -1,2 +1,2 @@
 config.toml
-/panorama
+/bin

Dockerfile

@@ -1,22 +1,16 @@
-FROM docker.io/node:18-alpine AS ui_builder
-WORKDIR /app/ui
-COPY ui/package*.json ./
-RUN npm install
-COPY ui .
-RUN npm run build
-
 FROM docker.io/golang:1.22-alpine AS backend_builder
 WORKDIR /app
-RUN apk add git
-COPY go.mod go.sum main.go ./
-RUN go mod download && go mod verify
-COPY --from=ui_builder /app/ui/build /app/ui/build
+RUN apk add git make
+COPY go.mod go.sum ./
+RUN go mod download
+COPY Makefile ./
+COPY cmd ./cmd
 COPY internal ./internal
-RUN go build -v
+RUN make
 
 FROM scratch
 WORKDIR /app
-COPY --from=backend_builder /app/panorama ./
+COPY --from=backend_builder /app/bin/panorama ./
 COPY config.example.toml /etc/panorama/config.toml
 
 ENTRYPOINT ["./panorama", "run", "--config", "/etc/panorama/config.toml"]

Makefile

@@ -0,0 +1,18 @@
+GOEXE=$(shell go env GOEXE)
+PANORAMA_BIN=bin/panorama${GOEXE}
+
+.PHONY: all
+all: ${PANORAMA_BIN}
+
+bin/panorama: \
+		cmd/panorama/* \
+		internal/**/*
+	go build -o ${PANORAMA_BIN} ./cmd/panorama
+
+.PHONY: lint
+lint:
+	golangci-lint run --fix=false --color=always
+
+.PHONY: clean
+clean:
+	rm -rf bin

internal/tile/tiler.go

@@ -85,6 +85,7 @@ func (t *Tiler) FullRender(game *game.Game, world *world.World, workers int, reg
 			positions <- render.TilePosition{X: x, Y: y}
 		}
 	}
+
 	close(positions)
 
 	wg.Wait()