From eab8edce8df59d6fdd916c8a910bacb101fc8493 Mon Sep 17 00:00:00 2001 From: Mark Cooper Date: Sat, 21 Aug 2021 13:02:24 -0500 Subject: [PATCH] Use local image as cover if found, adding release-it version control --- .dockerignore | 1 + .gitignore | 1 + .release-it.json | 5 + Dockerfile | 4 - client/components/cards/BookCover.vue | 29 +- client/components/ui/MultiSelect.vue | 2 +- client/components/ui/TextInputWithLabel.vue | 2 +- client/components/ui/TextareaWithLabel.vue | 2 +- client/layouts/default.vue | 6 + client/nuxt.config.js | 5 +- client/pages/config/index.vue | 2 +- client/plugins/axios.js | 3 + package-lock.json | 2137 ++++++++++++++++++- package.json | 8 +- server/Book.js | 10 +- server/Server.js | 9 - server/streamTest.js | 112 - server/utils/scandir.js | 4 + 18 files changed, 2200 insertions(+), 142 deletions(-) create mode 100644 .release-it.json delete mode 100644 server/streamTest.js diff --git a/.dockerignore b/.dockerignore index 7c0fca62..bcf90cc7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ +.env node_modules npm-debug.log .git diff --git a/.gitignore b/.gitignore index b3ab7bd8..f4db32f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env dev.js node_modules/ /config/ diff --git a/.release-it.json b/.release-it.json new file mode 100644 index 00000000..d280b4de --- /dev/null +++ b/.release-it.json @@ -0,0 +1,5 @@ +{ + "github": { + "release": true + } +} diff --git a/Dockerfile b/Dockerfile index 84d2d0e5..fa6d2479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ ### STAGE 0: FFMPEG ### FROM jrottenberg/ffmpeg:4.1-alpine AS ffmpeg -# FROM alfg/ffmpeg AS ffmpeg ### STAGE 1: Build client ### FROM node:12-alpine AS build @@ -11,8 +10,6 @@ RUN npm run generate ### STAGE 2: Build server ### FROM node:12-alpine -# RUN apk add --no-cache ffmpeg -# RUN apt-get install -y ffmpeg ENV NODE_ENV=production ENV LOG_LEVEL=INFO COPY --from=build /client/dist /client/dist @@ -22,5 +19,4 @@ COPY package.json package.json COPY server server RUN npm install --production EXPOSE 80 -# CMD ["node", "index.js"] CMD ["npm", "start"] diff --git a/client/components/cards/BookCover.vue b/client/components/cards/BookCover.vue index 7eb7e477..460f1ac0 100644 --- a/client/components/cards/BookCover.vue +++ b/client/components/cards/BookCover.vue @@ -1,7 +1,13 @@