mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 16:59:12 +00:00
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
This commit is contained in:
parent
f234caec08
commit
0d7cbdfe50
4 changed files with 22 additions and 16 deletions
16
Dockerfile
16
Dockerfile
|
@ -1,10 +1,14 @@
|
||||||
# build web
|
# build web
|
||||||
FROM node:18.17.0-alpine3.18 AS web-builder
|
FROM node:18.17.0-alpine3.18 AS web-builder
|
||||||
COPY . ./
|
RUN corepack enable
|
||||||
|
|
||||||
WORKDIR /web
|
WORKDIR /web
|
||||||
RUN corepack enable && \
|
|
||||||
pnpm install --frozen-lockfile && \
|
COPY web/package.json web/pnpm-lock.yaml ./
|
||||||
pnpm run build
|
RUN pnpm install --frozen-lockfile
|
||||||
|
|
||||||
|
COPY web ./
|
||||||
|
RUN pnpm run build
|
||||||
|
|
||||||
# build app
|
# build app
|
||||||
FROM golang:1.20-alpine3.18 AS app-builder
|
FROM golang:1.20-alpine3.18 AS app-builder
|
||||||
|
@ -13,7 +17,7 @@ ARG VERSION=dev
|
||||||
ARG REVISION=dev
|
ARG REVISION=dev
|
||||||
ARG BUILDTIME
|
ARG BUILDTIME
|
||||||
|
|
||||||
RUN apk add --no-cache git make build-base tzdata
|
RUN apk add --no-cache git build-base tzdata
|
||||||
|
|
||||||
ENV SERVICE=autobrr
|
ENV SERVICE=autobrr
|
||||||
|
|
||||||
|
@ -23,7 +27,6 @@ COPY go.mod go.sum ./
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
|
|
||||||
COPY . ./
|
COPY . ./
|
||||||
|
|
||||||
COPY --from=web-builder /web/dist ./web/dist
|
COPY --from=web-builder /web/dist ./web/dist
|
||||||
COPY --from=web-builder /web/build.go ./web
|
COPY --from=web-builder /web/build.go ./web
|
||||||
|
|
||||||
|
@ -54,4 +57,3 @@ COPY --from=app-builder /src/bin/autobrrctl /usr/local/bin/
|
||||||
EXPOSE 7474
|
EXPOSE 7474
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/autobrr", "--config", "/config"]
|
ENTRYPOINT ["/usr/local/bin/autobrr", "--config", "/config"]
|
||||||
#CMD ["--config", "/config"]
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": ".",
|
"homepage": ".",
|
||||||
"packageManager": "pnpm@8.6.2",
|
"packageManager": "pnpm@8.6.11",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "vite",
|
"start": "vite",
|
||||||
"build": "tsc && vite build",
|
"build": "tsc && vite build",
|
||||||
|
@ -55,6 +55,7 @@
|
||||||
"formik": "^2.4.3",
|
"formik": "^2.4.3",
|
||||||
"http-proxy-middleware": "^2.0.6",
|
"http-proxy-middleware": "^2.0.6",
|
||||||
"postcss": "^8.4.27",
|
"postcss": "^8.4.27",
|
||||||
|
"postcss-import": "^15.1.0",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-debounce-input": "^3.3.0",
|
"react-debounce-input": "^3.3.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
|
|
3
web/pnpm-lock.yaml
generated
3
web/pnpm-lock.yaml
generated
|
@ -86,6 +86,9 @@ dependencies:
|
||||||
postcss:
|
postcss:
|
||||||
specifier: ^8.4.27
|
specifier: ^8.4.27
|
||||||
version: 8.4.27
|
version: 8.4.27
|
||||||
|
postcss-import:
|
||||||
|
specifier: ^15.1.0
|
||||||
|
version: 15.1.0(postcss@8.4.27)
|
||||||
react:
|
react:
|
||||||
specifier: ^18.2.0
|
specifier: ^18.2.0
|
||||||
version: 18.2.0
|
version: 18.2.0
|
||||||
|
|
|
@ -4,5 +4,5 @@ module.exports = {
|
||||||
"tailwindcss/nesting": {},
|
"tailwindcss/nesting": {},
|
||||||
tailwindcss: {},
|
tailwindcss: {},
|
||||||
autoprefixer: {},
|
autoprefixer: {},
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue