Chore: cleanup unused workers, set all alpine images, add cache

sensorbucket · May 22, 2024 · e78ce4f · e78ce4f
1 parent 203f3a1
commit e78ce4f
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 551 deletions.
diff --git a/.github/workflows/build-docker-images.yaml b/.github/workflows/build-docker-images.yaml
@@ -58,8 +58,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: services/core/Dockerfile
-          target: builder
+          file: Dockerfile.cache
           push: true
           platforms: linux/amd64,linux/arm64
           tags: ${{ env.BUILDCACHE_TAG }}

diff --git a/Dockerfile.cache b/Dockerfile.cache
@@ -0,0 +1,6 @@
+FROM golang:1.21-alpine
+WORKDIR /sensorbucket
+
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
diff --git a/services/core/Dockerfile b/services/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 AS builder
+FROM golang:1.21-alpine AS builder
 WORKDIR /sensorbucket
 
 COPY go.mod .

diff --git a/services/fission-rmq-connector/Dockerfile b/services/fission-rmq-connector/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 AS builder
+FROM golang:1.21-alpine AS builder
 WORKDIR /sensorbucket
 
 COPY go.mod .

diff --git a/services/fission-user-workers/Dockerfile b/services/fission-user-workers/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 AS builder
+FROM golang:1.21-alpine AS builder
 WORKDIR /sensorbucket
 
 COPY go.mod .

diff --git a/services/httpimporter/Dockerfile b/services/httpimporter/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 AS builder
+FROM golang:1.21-alpine AS builder
 WORKDIR /sensorbucket
 
 COPY go.mod .

diff --git a/services/tenants/transports/webui/routes/api-keys.go b/services/tenants/transports/webui/routes/api-keys.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 
@@ -419,14 +418,3 @@ func toViewTenants(tenants []tenants.CreateTenantDTO) []views.TenantInfo {
 	}
 	return viewTenants
 }
-
-func getCursor(next string) string {
-	if next == "" {
-		return ""
-	}
-	u, err := url.Parse(next)
-	if err != nil {
-		return ""
-	}
-	return u.Query().Get("cursor")
-}
diff --git a/services/tenants/transports/webui/static/style.css b/services/tenants/transports/webui/static/style.css
@@ -582,10 +582,6 @@ video {
   z-index: 10;
 }
 
-.z-\[5000\] {
-  z-index: 5000;
-}
-
 .col-span-full {
   grid-column: 1 / -1;
 }
@@ -1212,11 +1208,6 @@ video {
   padding-bottom: 0.25rem;
 }
 
-.py-1\.5 {
-  padding-top: 0.375rem;
-  padding-bottom: 0.375rem;
-}
-
 .py-2 {
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
@@ -1532,59 +1523,7 @@ video {
 }
 
 @media (min-width: 1024px) {
-  .lg\:ml-sidebar {
-    margin-left: 16rem;
-  }
-
-  .lg\:mt-0 {
-    margin-top: 0px;
-  }
-
-  .lg\:block {
-    display: block;
-  }
-
-  .lg\:hidden {
-    display: none;
-  }
-
-  .lg\:h-auto {
-    height: auto;
-  }
-
-  .lg\:h-header {
-    height: 4rem;
-  }
-
-  .lg\:h-screen {
-    height: 100vh;
-  }
-
-  .lg\:w-sidebar {
-    width: 16rem;
-  }
-
   .lg\:grid-cols-1 {
     grid-template-columns: repeat(1, minmax(0, 1fr));
   }
-
-  .lg\:flex-col {
-    flex-direction: column;
-  }
-
-  .lg\:justify-end {
-    justify-content: flex-end;
-  }
-
-  .lg\:p-0 {
-    padding: 0px;
-  }
-
-  .lg\:pl-8 {
-    padding-left: 2rem;
-  }
-
-  .lg\:pr-12 {
-    padding-right: 3rem;
-  }
 }
diff --git a/services/tracing/Dockerfile b/services/tracing/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 AS builder
+FROM golang:1.21-alpine AS builder
 WORKDIR /sensorbucket
 
 COPY go.mod .

diff --git a/workers/multiflexmeter-groundwater-level/Dockerfile b/workers/multiflexmeter-groundwater-level/Dockerfile
diff --git a/workers/multiflexmeter-groundwater-level/main.go b/workers/multiflexmeter-groundwater-level/main.go
diff --git a/workers/multiflexmeter-particulatematter/Dockerfile b/workers/multiflexmeter-particulatematter/Dockerfile
diff --git a/workers/multiflexmeter-particulatematter/main.go b/workers/multiflexmeter-particulatematter/main.go
diff --git a/workers/pzld-sensorbox/Dockerfile b/workers/pzld-sensorbox/Dockerfile