From 0d7cbdfe50f02670d0ac7ffc984a27f6f085fead Mon Sep 17 00:00:00 2001
From: Fabricio Silva <hi@fabricio.dev>
Date: Mon, 28 Aug 2023 22:16:38 +0100
Subject: [PATCH] build(docker): improve cache on web-builder stage (#1034)

* upgrade pnpm

* add postcss-import npm dependency

* fix postcss.config.js lint

* improve cache for Docker web-builder stage
---
 Dockerfile            | 16 +++++++++-------
 web/package.json      |  3 ++-
 web/pnpm-lock.yaml    |  3 +++
 web/postcss.config.js | 16 ++++++++--------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b70d59e..c68fd32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,14 @@
 # build web
 FROM node:18.17.0-alpine3.18 AS web-builder
-COPY . ./
+RUN corepack enable
+
 WORKDIR /web
-RUN corepack enable && \
-    pnpm install --frozen-lockfile && \
-    pnpm run build
+
+COPY web/package.json web/pnpm-lock.yaml ./
+RUN pnpm install --frozen-lockfile
+
+COPY web ./
+RUN pnpm run build
 
 # build app
 FROM golang:1.20-alpine3.18 AS app-builder
@@ -13,7 +17,7 @@ ARG VERSION=dev
 ARG REVISION=dev
 ARG BUILDTIME
 
-RUN apk add --no-cache git make build-base tzdata
+RUN apk add --no-cache git build-base tzdata
 
 ENV SERVICE=autobrr
 
@@ -23,7 +27,6 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . ./
-
 COPY --from=web-builder /web/dist ./web/dist
 COPY --from=web-builder /web/build.go ./web
 
@@ -54,4 +57,3 @@ COPY --from=app-builder /src/bin/autobrrctl /usr/local/bin/
 EXPOSE 7474
 
 ENTRYPOINT ["/usr/local/bin/autobrr", "--config", "/config"]
-#CMD ["--config", "/config"]
diff --git a/web/package.json b/web/package.json
index d610652..3194047 100644
--- a/web/package.json
+++ b/web/package.json
@@ -3,7 +3,7 @@
   "version": "0.2.0",
   "private": true,
   "homepage": ".",
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@8.6.11",
   "scripts": {
     "start": "vite",
     "build": "tsc && vite build",
@@ -55,6 +55,7 @@
     "formik": "^2.4.3",
     "http-proxy-middleware": "^2.0.6",
     "postcss": "^8.4.27",
+    "postcss-import": "^15.1.0",
     "react": "^18.2.0",
     "react-debounce-input": "^3.3.0",
     "react-dom": "^18.2.0",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index a01edc2..e06a9b0 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -86,6 +86,9 @@ dependencies:
   postcss:
     specifier: ^8.4.27
     version: 8.4.27
+  postcss-import:
+    specifier: ^15.1.0
+    version: 15.1.0(postcss@8.4.27)
   react:
     specifier: ^18.2.0
     version: 18.2.0
diff --git a/web/postcss.config.js b/web/postcss.config.js
index 1c485a9..6887c82 100644
--- a/web/postcss.config.js
+++ b/web/postcss.config.js
@@ -1,8 +1,8 @@
-module.exports = {  
-    plugins: {
-      "postcss-import": {},
-      "tailwindcss/nesting": {},
-      tailwindcss: {},    
-      autoprefixer: {},  
-    }
-  }
\ No newline at end of file
+module.exports = {
+  plugins: {
+    "postcss-import": {},
+    "tailwindcss/nesting": {},
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};