mirror of
https://github.com/xuthus83/pigallery2.git
synced 2024-11-03 21:04:03 +08:00
Merge branch 'bpatrik:master' into master
This commit is contained in:
commit
313aee8def
@ -1,6 +1,7 @@
|
|||||||
#-----------------BUILDER-----------------
|
#-----------------BUILDER-----------------
|
||||||
#-----------------------------------------
|
#-----------------------------------------
|
||||||
FROM node:18-bullseye AS builder
|
FROM node:18-bullseye AS builder
|
||||||
|
RUN apt update && apt install -y --no-install-recommends libvips-dev python3
|
||||||
COPY pigallery2-release /app
|
COPY pigallery2-release /app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN npm install --unsafe-perm
|
RUN npm install --unsafe-perm
|
||||||
@ -25,7 +26,7 @@ ENV NODE_ENV=production \
|
|||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends ca-certificates wget ffmpeg \
|
&& apt-get install -y --no-install-recommends ca-certificates wget ffmpeg libvips42 \
|
||||||
&& apt-get clean -q -y \
|
&& apt-get clean -q -y \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
COPY --from=builder /app /app
|
COPY --from=builder /app /app
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#-----------------BUILDER-----------------
|
#-----------------BUILDER-----------------
|
||||||
#-----------------------------------------
|
#-----------------------------------------
|
||||||
FROM node:18-buster AS builder
|
FROM node:18-buster AS builder
|
||||||
|
RUN apt update && apt install -y --no-install-recommends libvips-dev python3
|
||||||
COPY pigallery2-release /app
|
COPY pigallery2-release /app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN npm install --unsafe-perm
|
RUN npm install --unsafe-perm
|
||||||
@ -25,7 +26,7 @@ ENV NODE_ENV=production \
|
|||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends ca-certificates wget ffmpeg \
|
&& apt-get install -y --no-install-recommends ca-certificates wget ffmpeg libvips42 \
|
||||||
&& apt-get clean -q -y \
|
&& apt-get clean -q -y \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
COPY --from=builder /app /app
|
COPY --from=builder /app /app
|
||||||
|
Loading…
Reference in New Issue
Block a user