MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-05 13:14:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker: use quoted values

Browse Source 
Avoids issues with certain characters in values.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-12-17 15:29:43 +13:00
parent 29f30b5d38
commit c717a827d3
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docker-compose.yml
View File

@ -4,8 +4,8 @@ services:
image: mariadb:10.2
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
- MYSQL_DATABASE=layersdb
- MYSQL_ROOT_PASSWORD=testingpw
- "MYSQL_DATABASE=layersdb"
- "MYSQL_ROOT_PASSWORD=testingpw"
container_name: layersdb
layersapp:
depends_on:
@ -16,11 +16,11 @@ services:
volumes:
- layersmeta:/opt/workdir
environment:
#- SECRET_KEY=<set this here>
- DATABASE_PASSWORD=testingpw
- DATABASE_HOST=layersdb
#- EMAIL_HOST=<set this here>
#- DEBUG=1
#- "SECRET_KEY=<set this here>"
- "DATABASE_PASSWORD=testingpw"
- "DATABASE_HOST=layersdb"
#- "EMAIL_HOST=<set this here>"
#- "DEBUG=1"
container_name: layersapp
layersweb:
depends_on:
@ -51,11 +51,11 @@ services:
volumes:
- layersmeta:/opt/workdir
environment:
#- SECRET_KEY=<set this here>
- DATABASE_PASSWORD=testingpw
- DATABASE_HOST=layersdb
#- EMAIL_HOST=<set this here>
#- DEBUG=1
#- "SECRET_KEY=<set this here>"
- "DATABASE_PASSWORD=testingpw"
- "DATABASE_HOST=layersdb"
#- "EMAIL_HOST=<set this here>"
#- "DEBUG=1"
container_name: layerscelery
command: /usr/local/bin/celery -A layerindex.tasks worker --loglevel=info --workdir=/opt/layerindex

18
dockersetup.py
View File

@ -100,15 +100,15 @@ def edit_dockercompose(hostname, dbpassword, secretkey, portmapping):
elif "hostname:" in line:
format = line[0:line.find("hostname")].replace("#", "")
newlines.append(format +"hostname: " + hostname + "\n")
elif "- SECRET_KEY" in line:
format = line[0:line.find("- SECRET_KEY")].replace("#", "")
newlines.append(format +"- SECRET_KEY=" + secretkey + "\n")
elif "- DATABASE_PASSWORD" in line:
format = line[0:line.find("- DATABASE_PASSWORD")].replace("#", "")
newlines.append(format +"- DATABASE_PASSWORD=" + dbpassword + "\n")
elif "- MYSQL_ROOT_PASSWORD" in line:
format = line[0:line.find("- MYSQL_ROOT_PASSWORD")].replace("#", "")
newlines.append(format +"- MYSQL_ROOT_PASSWORD=" + dbpassword + "\n")
elif '- "SECRET_KEY' in line:
format = line[0:line.find('- "SECRET_KEY')].replace("#", "")
newlines.append(format + '- "SECRET_KEY=' + secretkey + '"\n')
elif '- "DATABASE_PASSWORD' in line:
format = line[0:line.find('- "DATABASE_PASSWORD')].replace("#", "")
newlines.append(format + '- "DATABASE_PASSWORD=' + dbpassword + '"\n')
elif '- "MYSQL_ROOT_PASSWORD' in line:
format = line[0:line.find('- "MYSQL_ROOT_PASSWORD')].replace("#", "")
newlines.append(format + '- "MYSQL_ROOT_PASSWORD=' + dbpassword + '"\n')
elif "ports:" in line:
if in_layersweb:
in_layersweb_ports = True