update docker image, mount ui outside of repo, scrap build routine

This commit is contained in:
ArneBo 2024-10-29 12:46:23 +01:00 committed by upsiflu
parent 5e2e1ac40a
commit 6db427f463
4 changed files with 14 additions and 19 deletions

View File

@ -51,12 +51,11 @@ services:
- HOST
- VUE_PORT
volumes:
- "../ui:/ui"
- "./front:/app"
- "/app/node_modules"
- "./po:/po"
networks:
- internal
command: sh -c "yarn dev --host"
api:
extends:

View File

@ -1,4 +1,4 @@
FROM node:18-alpine
FROM node:22-alpine
# needed to compile translations
RUN apk add --no-cache jq bash coreutils python3
@ -6,15 +6,4 @@ RUN apk add --no-cache jq bash coreutils python3
EXPOSE 8080
WORKDIR /app/
# Create node_modules directory to prevent it from being hidden by volume mounts
RUN mkdir -p node_modules
# Copy entry script
COPY scripts/ ./scripts/
ADD package.json yarn.lock ./
RUN apk add git
RUN yarn install
COPY . .
CMD ["yarn", "serve"]
CMD yarn && yarn dev --host

View File

@ -66,6 +66,7 @@
},
"devDependencies": {
"@faker-js/faker": "8.4.1",
"@funkwhale/ui": "file:/ui",
"@iconify/vue": "4.1.1",
"@intlify/eslint-plugin-vue-i18n": "2.0.0",
"@intlify/unplugin-vue-i18n": "2.0.0",
@ -107,7 +108,6 @@
"sinon": "15.0.2",
"standardized-audio-context-mock": "9.6.32",
"typescript": "5.3.3",
"@funkwhale/ui": "git+https://dev.funkwhale.audio/funkwhale/ui.git#a6afb1cce97f2456ff2b3944bf2bf138ba45703a",
"unocss": "0.58.0",
"unplugin-vue-macros": "2.4.6",
"utility-types": "3.10.0",

View File

@ -1855,9 +1855,8 @@
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.4.1.tgz#5d5e8aee8fce48f5e189bf730ebd1f758f491451"
integrity sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==
"@funkwhale/ui@git+https://dev.funkwhale.audio/funkwhale/ui.git#a6afb1cce97f2456ff2b3944bf2bf138ba45703a":
"@funkwhale/ui@file:../ui":
version "0.3.0"
resolved "git+https://dev.funkwhale.audio/funkwhale/ui.git#a6afb1cce97f2456ff2b3944bf2bf138ba45703a"
dependencies:
dompurify "^2.4.3 || ^3.0.0"
showdown "^2.1.0"
@ -4773,7 +4772,7 @@ buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
"buffer-polyfill@npm:buffer@^6.0.3", buffer@^6.0.3:
"buffer-polyfill@npm:buffer@^6.0.3":
version "6.0.3"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
@ -4794,6 +4793,14 @@ buffer@^5.6.0, buffer@^5.7.1:
base64-js "^1.3.1"
ieee754 "^1.1.13"
buffer@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
dependencies:
base64-js "^1.3.1"
ieee754 "^1.2.1"
builtin-modules@^3.1.0, builtin-modules@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"