Add docker-compose infra to build and run the admin

frouioui · frouioui · commit d5f42f33d29c · 2024-08-30T13:04:51.000-06:00
Signed-off-by: Florent Poinsard &lt;florent.poinsard@outlook.fr&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.22.5-bookworm AS build-stage
+FROM golang:1.23.0-bookworm AS build-stage
 
 WORKDIR /build
 
diff --git a/Dockerfile.admin b/Dockerfile.admin
@@ -0,0 +1,40 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM golang:1.23.0-bookworm AS build-stage
+
+WORKDIR /build
+
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+COPY . .
+
+# Build arewefastyet
+RUN CGO_ENABLED=0 GOOS=linux go build -o /arewefastyetcli ./go/main.go
+
+FROM debian:bookworm AS run-stage
+
+# Copy the source code to the working directory
+COPY --from=build-stage /arewefastyetcli /arewefastyetcli
+COPY --from=build-stage /build/go/admin/templates/ /go/admin/templates/
+COPY --from=build-stage /build/go/admin/assets/ /go/admin/assets/
+
+EXPOSE 8081
+
+# Configuration files MUST be attached to the container using a volume.
+# The configuration files are not mounted on the Docker image for obvious
+# security reasons.
+CMD ["/arewefastyetcli", "admin", "--config", "/config/config.yaml", "--secrets", "/config/secrets.yaml"]
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -70,6 +70,24 @@ services:
       - "traefik.http.services.api.loadbalancer.server.port=8080"
     network_mode: bridge
 
+  admin:
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile.admin
+    image: "arewefastyet-admin"
+    container_name: "admin"
+    volumes:
+      - "./config/prod/config.yaml:/config/config.yaml"
+      - "./config/prod/secrets.yaml:/config/secrets.yaml"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.admin.rule=Host(`benchmark.vitess.io`) && PathPrefix(`/admin`)"
+      - "traefik.http.routers.admin.entrypoints=https"
+      - "traefik.http.routers.admin.tls.certresolver=tlsresolver"
+      - "traefik.http.services.admin.loadbalancer.server.port=8081"
+    network_mode: bridge
+
   cleanup_executions:
     image: alpine
     restart: on-failure
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,6 +53,24 @@ services:
       - "traefik.http.services.api.loadbalancer.server.port=8080"
     network_mode: bridge
 
+  admin:
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile.admin
+    image: "arewefastyet-admin"
+    container_name: "admin"
+    volumes:
+      - "./config/dev/config.yaml:/config/config.yaml"
+      - "./config/dev/secrets.yaml:/config/secrets.yaml"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.admin.rule=Host(`localhost`)"
+      - "traefik.http.routers.admin.rule=PathPrefix(`/admin`)"
+      - "traefik.http.routers.admin.entrypoints=http"
+      - "traefik.http.services.admin.loadbalancer.server.port=8081"
+    network_mode: bridge
+
   frontend:
     build:
       context: ./website
diff --git a/go/admin/admin.go b/go/admin/admin.go
@@ -21,13 +21,9 @@ package admin
 import (
 	"errors"
 	"net/http"
-	"path/filepath"
-	"runtime"
 	"time"
 
 	"github.com/gin-contrib/cors"
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -51,7 +47,7 @@ type Admin struct {
 
 	ghAppId     string
 	ghAppSecret string
-	auth string
+	auth        string
 
 	dbCfg    *psdb.Config
 	dbClient *psdb.Client
@@ -113,18 +109,12 @@ func (a *Admin) Run() error {
 		return errors.New(server.ErrorIncorrectConfiguration)
 	}
 
-	_, b, _, _ := runtime.Caller(0)
-	basepath := filepath.Dir(b)
-
 	a.Mode.SetGin()
 	a.router = gin.Default()
 
-	store := cookie.NewStore([]byte("secret"))
-	a.router.Use(sessions.Sessions("admin-session", store))
-
-	a.router.Static("/assets", filepath.Join(basepath, "assets"))
+	a.router.Static("/admin/assets", "/go/admin/assets")
 
-	a.router.LoadHTMLGlob(filepath.Join(basepath, "templates/*"))
+	a.router.LoadHTMLGlob("/go/admin/templates/*")
 
 	a.router.Use(cors.New(cors.Config{
 		AllowOrigins:     []string{"*"},
diff --git a/go/admin/api.go b/go/admin/api.go
@@ -39,7 +39,7 @@ var (
 	oauthConf = &oauth2.Config{
 		Scopes:      []string{"read:org"}, // Request access to read organization membership
 		Endpoint:    github.Endpoint,
-		RedirectURL: "http://localhost:8081/admin/auth/callback",
+		RedirectURL: "http://localhost/admin/auth/callback",
 	}
 	oauthStateString = random.String(10) // A random string to protect against CSRF attacks
 	client           *goGithub.Client
@@ -258,7 +258,7 @@ func (a *Admin) handleExecutionsAdd(c *gin.Context) {
 		return
 	}
 
-	serverAPIURL := "http://localhost:8080/api/executions/add"
+	serverAPIURL := "http://localhost/api/executions/add"
 
 	if a.Mode == server.ProductionMode {
 		serverAPIURL = "https://benchmark.vitess.io/api/executions/add"
diff --git a/go/admin/templates/base.html b/go/admin/templates/base.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Arewefastyet Admin</title>
-    <link rel="icon" type="image/png" href="/assets/favicon.ico" />
+    <link rel="icon" type="image/png" href="/admin/assets/favicon.ico" />
     <link
       href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
       rel="stylesheet"
diff --git a/go/admin/templates/header.html b/go/admin/templates/header.html
@@ -3,7 +3,7 @@
 >
     <a href="/admin/dashboard" class="cursor-pointer flex flex-1 gap-x-2 items-center">
       <img
-        src="/assets/logo.png"
+        src="/admin/assets/logo.png"
         alt="Logo"
         class="w-8"
       />
diff --git a/go/admin/templates/login.html b/go/admin/templates/login.html
@@ -12,11 +12,11 @@
 
   <body class="flex flex-col items-center justify-center h-screen bg-white">
     <div class="flex flex-row">
-      <img src="/assets/logo.png" class="h-12" alt="logo" />
+      <img src="/admin/assets/logo.png" class="h-12" alt="logo" />
       <h1 class="text-3xl font-bold mb-2">arewefastyet</h1>
     </div>
     <h2 class="text-5xl font-semibold text-orange-500 mb-8">Admin Login</h2>
-    <img src="/assets/github-icon.png" alt="GitHub Icon" class="w-32 h-32" />
+    <img src="/admin/assets/github-icon.png" alt="GitHub Icon" class="w-32 h-32" />
     <button
       class="bg-black text-white flex items-center justify-center gap-2 px-4 py-2 rounded-md hover:bg-gray-800 transition mx-auto"
     >

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`>`
`4`	`4`	`<a href="/admin/dashboard" class="cursor-pointer flex flex-1 gap-x-2 items-center">`
`5`	`5`	`<img`
`6`		`- src="/assets/logo.png"`
	`6`	`+ src="/admin/assets/logo.png"`
`7`	`7`	`alt="Logo"`
`8`	`8`	`class="w-8"`
`9`	`9`	`/>`