rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

barrel: Rename 'REAL_PATH' => 'DATA_PATH'

Browse source
This commit is contained in:
Tom Wiesing 2022-09-08 17:13:20 +02:00
parent 89bbbb7371
commit 086b359e17
No known key found for this signature in database
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distillery/resources/compose/barrel/.env.sample
View file

@ -3,7 +3,7 @@
####################### #######################
# Real path for volumes to be stored # Real path for volumes to be stored
REAL_PATH=/var/www/deploy/instances/example.slug DATA_PATH=/var/www/deploy/instances/example.slug/data
UTILS_DIR=/var/www/deploy/runtime/utils/ UTILS_DIR=/var/www/deploy/runtime/utils/
####################### #######################

6
distillery/resources/compose/barrel/docker-compose.yml
View file

@ -22,9 +22,9 @@ services:
# volumes that are mounted # volumes that are mounted
volumes: volumes:
- ${GLOBAL_AUTHORIZED_KEYS_FILE}:/var/www/.ssh/global_authorized_keys:ro - ${GLOBAL_AUTHORIZED_KEYS_FILE}:/var/www/.ssh/global_authorized_keys:ro
- ${REAL_PATH}/.composer:/var/www/.composer - ${DATA_PATH}/.composer:/var/www/.composer
- ${REAL_PATH}/data:/var/www/data - ${DATA_PATH}/data:/var/www/data
- ${REAL_PATH}/authorized_keys:/var/www/.ssh/authorized_keys - ${DATA_PATH}/authorized_keys:/var/www/.ssh/authorized_keys
- ${UTILS_DIR}:/utils:ro - ${UTILS_DIR}:/utils:ro
networks: networks:

2
distillery/resources/templates/docker-env/barrel
View file

@ -1,4 +1,4 @@
REAL_PATH=${REAL_PATH} DATA_PATH=${DATA_PATH}
UTILS_DIR=${UTILS_DIR} UTILS_DIR=${UTILS_DIR}
SLUG=${SLUG} SLUG=${SLUG}

2
env/instances.go vendored
View file

@ -233,7 +233,7 @@ func (instance Instance) Stack() stack.Installable {
EnvFileResource: filepath.Join("resources", "templates", "docker-env", "barrel"), EnvFileResource: filepath.Join("resources", "templates", "docker-env", "barrel"),
EnvFileContext: map[string]string{ EnvFileContext: map[string]string{
"REAL_PATH": instance.FilesystemBase, "DATA_PATH": filepath.Join(instance.FilesystemBase, "data"),
"SLUG": instance.Slug, "SLUG": instance.Slug,
"VIRTUAL_HOST": instance.Domain(), "VIRTUAL_HOST": instance.Domain(),