mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Optimize Dockerfile

This commit is contained in:
viktorstrate 2021-02-25 15:38:09 +01:00
parent 9a418cb5b0
commit 38e1871415
No known key found for this signature in database
GPG Key ID: 3F855605109C1E8A
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Dockerfile
View File

@ -14,28 +14,28 @@ WORKDIR /app
# Download dependencies # Download dependencies
COPY ui/package*.json /app/ COPY ui/package*.json /app/
RUN npm install RUN npm install
COPY ui /app
# Build frontend # Build frontend
COPY ui /app
RUN npm run build -- --public-url $UI_PUBLIC_URL RUN npm run build -- --public-url $UI_PUBLIC_URL
### Build API ### ### Build API ###
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.15-buster AS api FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.15-buster AS api
# Install G++/GCC cross compilers # Install G++/GCC cross compilers
RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture arm64 && dpkg --add-architecture armhf
RUN dpkg --add-architecture armhf RUN apt-get update && apt-get install -y \
RUN apt-get update g++-aarch64-linux-gnu \
RUN apt-get install -y g++-aarch64-linux-gnu libc6-dev-arm64-cross g++-arm-linux-gnueabihf libc6-dev-armhf-cross libc6-dev-arm64-cross \
g++-arm-linux-gnueabihf \
# Install go-face dependencies libc6-dev-armhf-cross \
RUN apt-get install -y \ # Install go-face dependencies
libdlib-dev libdlib-dev:arm64 libdlib-dev:armhf \ libdlib-dev libdlib-dev:arm64 libdlib-dev:armhf \
libblas-dev libblas-dev:arm64 libblas-dev:armhf \ libblas-dev libblas-dev:arm64 libblas-dev:armhf \
liblapack-dev liblapack-dev:arm64 liblapack-dev:armhf \ liblapack-dev liblapack-dev:arm64 liblapack-dev:armhf \
libjpeg62-turbo-dev libjpeg62-turbo-dev:arm64 libjpeg62-turbo-dev:armhf libjpeg62-turbo-dev libjpeg62-turbo-dev:arm64 libjpeg62-turbo-dev:armhf \
# Cleanup
RUN echo $PATH && apt-get clean && rm -rf /var/lib/apt/lists/*
COPY docker/go_wrapper.sh /go/bin/go COPY docker/go_wrapper.sh /go/bin/go
RUN chmod +x /go/bin/go RUN chmod +x /go/bin/go
@ -52,16 +52,16 @@ WORKDIR /app
COPY api/go.mod api/go.sum /app/ COPY api/go.mod api/go.sum /app/
RUN go mod download RUN go mod download
# Build go-face # Patch go-face
RUN sed -i 's/-march=native//g' /go/pkg/mod/github.com/!kagami/go-face*/face.go RUN sed -i 's/-march=native//g' /go/pkg/mod/github.com/!kagami/go-face*/face.go
RUN go install github.com/Kagami/go-face
# Build go-sqlite3 dependency with CGO # Build dependencies that use CGO
RUN go install github.com/mattn/go-sqlite3 RUN go install \
github.com/mattn/go-sqlite3 \
github.com/Kagami/go-face
# Copy api source # Copy and build api source
COPY api /app COPY api /app
RUN go build -v -o photoview . RUN go build -v -o photoview .
### Copy api and ui to production environment ### ### Copy api and ui to production environment ###
@ -70,15 +70,13 @@ WORKDIR /app
COPY api/data /app/data COPY api/data /app/data
RUN apt-get update RUN apt-get update \
# Required dependencies
# Install runtime dependencies && apt-get install -y libdlib19 \
RUN apt-get install -y libdlib19 # Optional dependencies
&& apt-get install -y ffmpeg darktable; exit 0 \
# Install darktable for converting RAW images, and ffmpeg for encoding videos # Cleanup
RUN apt-get install -y darktable; exit 0 && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN apt-get install -y ffmpeg; exit 0
RUN rm -rf /var/lib/apt/lists/*
COPY --from=ui /app/dist /ui COPY --from=ui /app/dist /ui
COPY --from=api /app/photoview /app/photoview COPY --from=api /app/photoview /app/photoview

2
ui/build.js
View File

@ -17,7 +17,7 @@ const defineEnv = ENVIRONMENT_VARIABLES.reduce((acc, key) => {
const esbuildOptions = { const esbuildOptions = {
entryPoints: ['src/index.js'], entryPoints: ['src/index.js'],
publicPath: '/', publicPath: process.env.UI_PUBLIC_URL || '/',
outdir: 'dist', outdir: 'dist',
format: 'esm', format: 'esm',
bundle: true, bundle: true,