samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dnpm: replace named volumes with fs volumes

This commit is contained in:
janskiba 2024-12-18 10:53:37 +00:00
parent af88abfae2
commit 7acf7b06c3
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ccp/modules/dnpm-node-compose.yml
View File

@ -12,13 +12,13 @@ services:
MYSQL_ROOT_HOST: "%" MYSQL_ROOT_HOST: "%"
MYSQL_ROOT_PASSWORD: ${DNPM_MYSQL_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${DNPM_MYSQL_ROOT_PASSWORD}
volumes: volumes:
- dnpm-mysql:/var/lib/mysql - /var/cache/bridgehead/dnpm/mysql:/var/lib/mysql
dnpm-authup: dnpm-authup:
image: authup/authup:latest image: authup/authup:latest
container_name: bridgehead-dnpm-authup container_name: bridgehead-dnpm-authup
volumes: volumes:
- dnpm-authup:/usr/src/app/writable - /var/cache/bridgehead/dnpm/authup:/usr/src/app/writable
depends_on: depends_on:
dnpm-mysql: dnpm-mysql:
condition: service_healthy condition: service_healthy
@ -68,7 +68,7 @@ services:
- AUTHUP_URL=robot://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000 - AUTHUP_URL=robot://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000
volumes: volumes:
- /etc/bridgehead/dnpm/config:/dnpm_config - /etc/bridgehead/dnpm/config:/dnpm_config
- dnpm-backend-data:/dnpm_data - /var/cache/bridgehead/dnpm/backend-data:/dnpm_data
depends_on: depends_on:
dnpm-authup: dnpm-authup:
condition: service_healthy condition: service_healthy
@ -81,8 +81,3 @@ services:
landing: landing:
labels: labels:
- "traefik.http.routers.landing.rule=PathPrefix(`/landing`)" - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"
volumes:
dnpm-authup:
dnpm-mysql:
dnpm-backend-data:

1
ccp/modules/dnpm-node-setup.sh
View File

@ -9,6 +9,7 @@ if [ -n "${ENABLE_DNPM_NODE}" ]; then
log ERROR "Mandatory variable ZPM_SITE not defined!" log ERROR "Mandatory variable ZPM_SITE not defined!"
exit 1 exit 1
fi fi
mkdir -p /var/cache/bridgehead/dnpm/ || fail_and_report 1 "Failed to create '/var/cache/bridgehead/dnpm/'. Please run sudo './bridgehead install $PROJECT' again to fix the permissions."
DNPM_SYNTH_NUM=${DNPM_SYNTH_NUM:--1} DNPM_SYNTH_NUM=${DNPM_SYNTH_NUM:--1}
DNPM_MYSQL_ROOT_PASSWORD="$(generate_simple_password 'dnpm mysql')" DNPM_MYSQL_ROOT_PASSWORD="$(generate_simple_password 'dnpm mysql')"
DNPM_AUTHUP_SECRET="$(generate_simple_password 'dnpm authup')" DNPM_AUTHUP_SECRET="$(generate_simple_password 'dnpm authup')"

11
minimal/modules/dnpm-node-compose.yml
View File

@ -12,13 +12,13 @@ services:
MYSQL_ROOT_HOST: "%" MYSQL_ROOT_HOST: "%"
MYSQL_ROOT_PASSWORD: ${DNPM_MYSQL_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${DNPM_MYSQL_ROOT_PASSWORD}
volumes: volumes:
- dnpm-mysql:/var/lib/mysql - /var/cache/bridgehead/dnpm/mysql:/var/lib/mysql
dnpm-authup: dnpm-authup:
image: authup/authup:latest image: authup/authup:latest
container_name: bridgehead-dnpm-authup container_name: bridgehead-dnpm-authup
volumes: volumes:
- dnpm-authup:/usr/src/app/writable - /var/cache/bridgehead/dnpm/authup:/usr/src/app/writable
depends_on: depends_on:
dnpm-mysql: dnpm-mysql:
condition: service_healthy condition: service_healthy
@ -68,7 +68,7 @@ services:
- AUTHUP_URL=robot://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000 - AUTHUP_URL=robot://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000
volumes: volumes:
- /etc/bridgehead/dnpm/config:/dnpm_config - /etc/bridgehead/dnpm/config:/dnpm_config
- dnpm-backend-data:/dnpm_data - /var/cache/bridgehead/dnpm/backend-data:/dnpm_data
depends_on: depends_on:
dnpm-authup: dnpm-authup:
condition: service_healthy condition: service_healthy
@ -81,8 +81,3 @@ services:
landing: landing:
labels: labels:
- "traefik.http.routers.landing.rule=PathPrefix(`/landing`)" - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"
volumes:
dnpm-authup:
dnpm-mysql:
dnpm-backend-data:

1
minimal/modules/dnpm-node-setup.sh
View File

@ -9,6 +9,7 @@ if [ -n "${ENABLE_DNPM_NODE}" ]; then
log ERROR "Mandatory variable ZPM_SITE not defined!" log ERROR "Mandatory variable ZPM_SITE not defined!"
exit 1 exit 1
fi fi
mkdir -p /var/cache/bridgehead/dnpm/ || fail_and_report 1 "Failed to create '/var/cache/bridgehead/dnpm/'. Please run sudo './bridgehead install $PROJECT' again to fix the permissions."
DNPM_SYNTH_NUM=${DNPM_SYNTH_NUM:--1} DNPM_SYNTH_NUM=${DNPM_SYNTH_NUM:--1}
DNPM_MYSQL_ROOT_PASSWORD="$(generate_simple_password 'dnpm mysql')" DNPM_MYSQL_ROOT_PASSWORD="$(generate_simple_password 'dnpm mysql')"
DNPM_AUTHUP_SECRET="$(generate_simple_password 'dnpm authup')" DNPM_AUTHUP_SECRET="$(generate_simple_password 'dnpm authup')"