Cleanup docker development setup

.dockerignore

@@ -1,3 +1,2 @@
-*.yml
 *.toml
-test
+working

.gitignore

@@ -1,2 +1,3 @@
+working
+server
 server.toml
-server-dind.toml

Dockerfile

@@ -1,14 +0,0 @@
-FROM golang:1.19-bullseye as builder
-MAINTAINER restitux <restitux@ohea.xyz>
-
-COPY . /server
-WORKDIR /server
-RUN go build .
-
-
-FROM debian:bullseye
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /server/server /server
-ENTRYPOINT ["/server"]

docker-compose.yml

@@ -1,11 +0,0 @@
-version: "3.3"
-services:
-  cursorius-server:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-    ports:
-      - "0.0.0.0:45420:45420"
-    volumes:
-      - "./server.toml:/root/.config/cursorius/server.toml"
-      - "/var/run/docker.sock:/var/run/docker.sock"

docker/Dockerfile

@@ -0,0 +1,20 @@
+FROM golang:1.19-bullseye as builder
+MAINTAINER restitux <restitux@ohea.xyz>
+
+# Install connect proto build deps
+RUN go install github.com/bufbuild/buf/cmd/buf@latest && \
+    go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest && \
+    go install google.golang.org/protobuf/cmd/protoc-gen-go@latest && \
+    go install github.com/bufbuild/connect-go/cmd/protoc-gen-connect-go@latest
+
+COPY . /server
+WORKDIR /server
+RUN go build .
+
+
+FROM debian:bullseye
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /server/server /server
+ENTRYPOINT ["/server"]

docker/Dockerfile.dev

@@ -0,0 +1,13 @@
+FROM golang:1.19-bullseye
+MAINTAINER restitux <restitux@ohea.xyz>
+
+# Install connect proto build deps
+RUN GOPATH="/go-bin" go install github.com/bufbuild/buf/cmd/buf@latest && \
+    GOPATH="/go-bin" go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest && \
+    GOPATH="/go-bin" go install google.golang.org/protobuf/cmd/protoc-gen-go@latest && \
+    GOPATH="/go-bin" go install github.com/bufbuild/connect-go/cmd/protoc-gen-connect-go@latest
+
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+ENTRYPOINT ["/build/docker/build-and-run.sh"]

docker/build-and-run.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+
+set -e
+
+cd /build
+go build .
+./server

docker/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.3"
+services:
+  cursorius-server:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile.dev
+    ports:
+      - "0.0.0.0:45420:45420"
+    volumes:
+      - "..:/build"
+      - "../server.toml:/root/.config/cursorius/server.toml"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "../working/go:/go-src"

docker/run-dev.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p working
+
+case $1 in
+    "default")
+        docker compose -f docker/docker-compose.yml down
+        docker compose -f docker/docker-compose.yml -f docker/webhook-override.yml down
+        docker compose -f docker/docker-compose.yml up --build -d
+        docker compose -f docker/docker-compose.yml logs -f;;
+    "webhook")
+        docker compose -f docker/docker-compose.yml down
+        docker compose -f docker/docker-compose.yml -f docker/webhook-override.yml down
+        docker compose -f docker/docker-compose.yml -f docker/webhook-override.yml up --build -d
+        docker compose -f docker/docker-compose.yml -f docker/webhook-override.yml logs -f;;
+    *) echo "ERROR: Unknown param \"$1\"" 2>&1
+       exit 255;;
+esac
+

docker/webhook-override.yml

@@ -1,16 +1,8 @@
 version: "3.3"
 services:
   cursorius-server:
-    build:
-      context: ..
-      dockerfile: ./Dockerfile
     networks:
       - gitea
-    ports:
-      - "0.0.0.0:45420:45420"
-    volumes:
-      - "../server.toml:/root/.config/cursorius/server.toml"
-      - "/var/run/docker.sock:/var/run/docker.sock"
   gitea:
     image: gitea/gitea:latest
     environment:

test/docker-compose.yml

@@ -1,12 +0,0 @@
-version: "3.3"
-services:
-  cursorius-server:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-    ports:
-      - "0.0.0.0:45420:45420"
-    volumes:
-      - "./server.toml:/root/.config/cursorius/server.toml"
-      - "/home/robby/development/restitux/ohea/cursorius/test/server/job:/job"
-      - "/var/run/docker.sock:/var/run/docker.sock"