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

Store slug with each barrel

Browse source
This commit is contained in:
Tom Wiesing 2020-07-14 16:42:17 +02:00
parent 8c5e7cf01a
commit 47795496b5
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
distillery/provision.sh
View file

@ -78,6 +78,7 @@ log_info " => Writing configuration file"
load_template "docker-env/barrel" \ load_template "docker-env/barrel" \
"REAL_PATH" "${INSTANCE_DATA_DIR}" \ "REAL_PATH" "${INSTANCE_DATA_DIR}" \
"VIRTUAL_HOST" "${INSTANCE_DOMAIN}" \ "VIRTUAL_HOST" "${INSTANCE_DOMAIN}" \
"SLUG" "${SLUG}" \
"LETSENCRYPT_HOST" "${LETSENCRYPT_HOST}" \ "LETSENCRYPT_HOST" "${LETSENCRYPT_HOST}" \
"LETSENCRYPT_EMAIL" "${LETSENCRYPT_EMAIL}" \ "LETSENCRYPT_EMAIL" "${LETSENCRYPT_EMAIL}" \
> "$INSTANCE_BASE_DIR/.env" > "$INSTANCE_BASE_DIR/.env"

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

@ -13,6 +13,10 @@ services:
LETSENCRYPT_HOST: ${LETSENCRYPT_HOST} LETSENCRYPT_HOST: ${LETSENCRYPT_HOST}
LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL} LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}
# label it with the current slug
labels:
eu.wiss-ki.barrel.slug: ${SLUG}
# the volumes to # the volumes to
volumes: volumes:
- ${REAL_PATH}/.composer:/var/www/.composer - ${REAL_PATH}/.composer:/var/www/.composer

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

@ -1,5 +1,6 @@
REAL_PATH=${REAL_PATH} REAL_PATH=${REAL_PATH}
SLUG=${SLUG}
VIRTUAL_HOST=${VIRTUAL_HOST} VIRTUAL_HOST=${VIRTUAL_HOST}
LETSENCRYPT_HOST=${LETSENCRYPT_HOST} LETSENCRYPT_HOST=${LETSENCRYPT_HOST}