Move frontend Docker Compose file to avoid pwd confusion in new version.
This commit is contained in:
parent
551e41164c
commit
97aaaa3cb4
20
Makefile
20
Makefile
|
@ -1,8 +1,12 @@
|
|||
SHELL=/bin/bash
|
||||
.PHONY: *
|
||||
|
||||
list:
|
||||
@LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
|
||||
|
||||
install: # Developer mode installation
|
||||
bash ./docker.sh install-dev
|
||||
|
||||
install-cloud-ide:
|
||||
cp docker-compose.sample.yml docker-compose.yml
|
||||
cp docker-compose.cloudide.yml docker-compose.override.yml
|
||||
|
@ -41,20 +45,20 @@ bash:
|
|||
docker-compose exec --user=azuracast web bash
|
||||
|
||||
frontend-bash:
|
||||
docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
|
||||
docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend
|
||||
|
||||
frontend-build:
|
||||
docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
|
||||
docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend npm run build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend npm run build
|
||||
|
||||
generate-locales:
|
||||
docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
|
||||
docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend npm run generate-locales
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend npm run generate-locales
|
||||
docker-compose exec --user=azuracast web azuracast_cli locale:generate
|
||||
|
||||
import-locales:
|
||||
docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
|
||||
docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend npm run import-locales
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend npm run import-locales
|
||||
docker-compose exec --user=azuracast web azuracast_cli locale:import
|
||||
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
services:
|
||||
frontend:
|
||||
container_name: azuracast_frontend
|
||||
build:
|
||||
context: ./frontend
|
||||
user: "${AZURACAST_PUID:-1000}:${AZURACAST_PGID:-1000}"
|
||||
volumes:
|
||||
- ./frontend:/data/frontend
|
||||
- ./resources/locale:/data/resources/locale
|
||||
- ./web/static:/data/web/static
|
||||
- frontend_node_modules:/data/frontend/node_modules
|
||||
|
||||
volumes:
|
||||
frontend_node_modules: { }
|
|
@ -495,8 +495,8 @@ install-dev() {
|
|||
docker-compose build
|
||||
docker-compose run --rm web -- azuracast_install "$@"
|
||||
|
||||
docker-compose -f frontend/docker-compose.yml build
|
||||
docker-compose -f frontend/docker-compose.yml run --rm frontend npm run dev-build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
|
||||
docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run --rm frontend npm run dev-build
|
||||
|
||||
docker-compose up -d
|
||||
exit
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM library/node:16-alpine
|
||||
FROM library/node:18-alpine
|
||||
|
||||
RUN apk update \
|
||||
&& apk add bash python3 make curl g++ shadow git
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
services :
|
||||
frontend :
|
||||
container_name : azuracast_frontend
|
||||
build :
|
||||
context : .
|
||||
user : "${AZURACAST_PUID:-1000}:${AZURACAST_PGID:-1000}"
|
||||
volumes:
|
||||
- ${LOCAL_WORKSPACE_FOLDER:-.}/frontend:/data/frontend
|
||||
- ${LOCAL_WORKSPACE_FOLDER:-.}/resources/locale:/data/resources/locale
|
||||
- ${LOCAL_WORKSPACE_FOLDER:-.}/web/static:/data/web/static
|
||||
- frontend_node_modules:/data/frontend/node_modules
|
||||
|
||||
volumes :
|
||||
frontend_node_modules : { }
|
Loading…
Reference in New Issue