From ee7b291ee993ea95cb8f905ebf874c8b0a9219b4 Mon Sep 17 00:00:00 2001
From: Matias Frank Jensen <matias@rig.dev>
Date: Thu, 28 Sep 2023 12:57:19 +0200
Subject: [PATCH] rig -> platform fixes

---
 Makefile                                  |  4 ---
 build/package/Dockerfile                  | 30 -----------------------
 deploy/docker-compose/docker-compose.yaml |  9 +++----
 pkg/auth/project.go                       |  2 +-
 4 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 build/package/Dockerfile

diff --git a/Makefile b/Makefile
index f46dc04b7..4ea47e09f 100644
--- a/Makefile
+++ b/Makefile
@@ -123,10 +123,6 @@ download-dashboard: ## ⬇️ Download latest dashboard to /pkg/service/web
 
 TAG ?= dev
 
-.PHONY: docker
-docker: ## 🐳 Build docker image
-	docker build -t ghcr.io/rigdev/rig:$(TAG) -f ./build/package/Dockerfile .
-
 .PHONY: docker-compose-up
 docker-compose-up: ## 🐳 Run docker-compose
 	@echo "$(DEVENVS)" | sed -e "s/ /\n/" > ./deploy/docker-compose/.env.dev
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
deleted file mode 100644
index 05c3f0c1f..000000000
--- a/build/package/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM golang:1.20.6-alpine3.18 AS builder
-
-ENV CGO_ENABLED=0
-ENV GOBIN=/app/tools/bin
-
-WORKDIR /app
-
-RUN apk add --no-cache ca-certificates make git
-
-COPY go.mod go.sum Makefile ./
-COPY tools tools
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    make gen/go/rig/go.mod && \
-    make buf protoc-gen-connect-go protoc-gen-go && \
-    go mod download # && go mod verify
-
-COPY . .
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    make proto build-rig-server build-rig-proxy build-rig-admin
-
-FROM scratch
-
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /app/bin/rig-server /usr/local/bin/
-COPY --from=builder /app/bin/rig-proxy /usr/local/bin/
-COPY --from=builder /app/bin/rig-admin /usr/local/bin/
-
-CMD ["rig-server"]
diff --git a/deploy/docker-compose/docker-compose.yaml b/deploy/docker-compose/docker-compose.yaml
index d5f38f32c..be0840608 100644
--- a/deploy/docker-compose/docker-compose.yaml
+++ b/deploy/docker-compose/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   mongodb:
@@ -31,14 +31,11 @@ services:
       - minio-data:/data
 
   rig:
-    container_name: "rig"
+    container_name: "rig-platform"
     depends_on:
       - mongodb
       - minio
-    image: ghcr.io/rigdev/rig:dev
-    build:
-      dockerfile: build/package/Dockerfile
-      context: ../../
+    image: ghcr.io/rigdev/rig-platform:dev
     ports:
       - "4747:4747"
       - "5001:5001"
diff --git a/pkg/auth/project.go b/pkg/auth/project.go
index 1a5f0701c..45415ac4b 100644
--- a/pkg/auth/project.go
+++ b/pkg/auth/project.go
@@ -6,7 +6,7 @@ import (
 	"github.com/rigdev/rig/pkg/errors"
 )
 
-var RigProjectID = "c10c947b-91f1-41ea-96df-ea13ee68a7fc"
+var RigProjectID = "rig"
 
 type projectIDKeyType string