chore: Update Docker image tags for next release

coollabsio · Oct 14, 2024 · 5ff995f · 5ff995f
1 parent 90556c1
commit 5ff995f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM golang:1.23 AS deps
+FROM golang:1.23-bullseye AS deps
 
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN go mod download
 
-FROM golang:1.23 AS build
+FROM golang:1.23-bullseye AS build
 
 WORKDIR /app
 COPY --from=deps /go/pkg/mod /go/pkg/mod
@@ -14,9 +14,10 @@ ENV CGO_ENABLED=1 \
     GOOS=linux \
     GOARCH=amd64
 
-RUN go build -ldflags="-s -w" -o /app/bin/sentinel ./
+RUN go build -o /app/bin/sentinel ./
 
-FROM gcr.io/distroless/cc-debian11
+FROM debian:bullseye-slim
+RUN apt-get update && apt-get install -y ca-certificates curl && rm -rf /var/lib/apt/lists/*
 ENV GIN_MODE=release
 COPY --from=build /app/bin/sentinel /app/sentinel
 CMD ["/app/sentinel"]
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,10 +1,10 @@
-FROM golang:1.23 AS deps
+FROM golang:1.23-bullseye AS deps
 
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN go mod download
 
-FROM golang:1.23 AS build
+FROM golang:1.23-bullseye AS build
 
 WORKDIR /app
 COPY --from=deps /go/pkg/mod /go/pkg/mod
@@ -14,9 +14,10 @@ ENV CGO_ENABLED=1 \
     GOOS=linux \
     GOARCH=arm64
 
-RUN go build -ldflags="-s -w" -o /app/bin/sentinel ./
+RUN go build -o /app/bin/sentinel ./
 
-FROM gcr.io/distroless/cc-debian11
+FROM debian:bullseye-slim
+RUN apt-get update && apt-get install -y ca-certificates curl && rm -rf /var/lib/apt/lists/*
 ENV GIN_MODE=release
 COPY --from=build /app/bin/sentinel /app/sentinel
 CMD ["/app/sentinel"]
diff --git a/main.go b/main.go
@@ -53,18 +53,21 @@ func main() {
 	token = tokenFromEnv
 
 	endpointFromEnv := os.Getenv("ENDPOINT")
-	if endpointFromEnv == "" {
-		if gin.Mode() == gin.DebugMode {
+	if gin.Mode() == gin.DebugMode {
+		if endpointFromEnv == "" {
 			endpoint = "http://localhost:8000"
-		} else {
-			log.Fatal("ENDPOINT environment variable is required")
 		}
+		endpoint = endpointFromEnv
 	} else {
-		// Validate that the endpoint is a valid HTTPS URL
-		if !strings.HasPrefix(endpointFromEnv, "https://") {
-			log.Fatal("ENDPOINT must be a valid HTTPS URL")
+		if endpointFromEnv == "" {
+			log.Fatal("ENDPOINT environment variable is required")
+		} else {
+			// Validate that the endpoint is a valid HTTPS URL
+			if !strings.HasPrefix(endpointFromEnv, "https://") {
+				log.Fatal("ENDPOINT must be a valid HTTPS URL")
+			}
+			endpoint = endpointFromEnv
 		}
-		endpoint = endpointFromEnv
 	}
 	pushUrl = endpoint + pushPath