Jean-Frédéric has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/379744 )
Change subject: Rename docker-compose files for default use case ...................................................................... Rename docker-compose files for default use case The setup using a harvesting bot turned out to be a much more frequent use case than using a DB dump. The default docker-compose.yml file should reflect that. Change-Id: I6dfe21fd4b6e0b0ae87f9e0cf302cac4a32a2bb7 --- M README.md D docker-compose-bot.yml A docker-compose-dump.yml M docker-compose.yml 4 files changed, 40 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage refs/changes/44/379744/1 diff --git a/README.md b/README.md index 7f4267e..4a30350 100644 --- a/README.md +++ b/README.md @@ -21,16 +21,16 @@ python erfgoedbot/fill_table_monuments_all.py # Build and start the Docker containers -docker-compose -f docker-compose-bot.yml up --build -d +docker-compose up --build -d # Ensure a directory for locally written pages mkdir -p docker_pages # Run the bot to harvest a country -docker-compose -f docker-compose-bot.yml run --rm bot python erfgoedbot/update_database.py -countrycode:ge -langcode:ka -log +docker-compose run --rm bot python erfgoedbot/update_database.py -countrycode:ge -langcode:ka -log # Update the monuments_all table -docker-compose -f docker-compose-bot.yml run --rm db mysql -h db s51138__heritage_p --user=heritage --password=password < erfgoedbot/sql/fill_table_monuments_all.sql +docker-compose run --rm db mysql -h db s51138__heritage_p --user=heritage --password=password < erfgoedbot/sql/fill_table_monuments_all.sql ``` The web interface will be accessible on http://localhost:8000/ @@ -45,7 +45,7 @@ ``` ./bin/download_monuments_database_dump.sh -docker-compose up -d +docker-compose -f docker-compose-dump.yml up -d ``` The web interface will be accessible on http://localhost:8000/ diff --git a/docker-compose-bot.yml b/docker-compose-bot.yml deleted file mode 100644 index b6cc878..0000000 --- a/docker-compose-bot.yml +++ /dev/null @@ -1,24 +0,0 @@ -bot: - extends: - file: docker-compose-base.yml - service: bot - links: - - db - environment: - - HERITAGE_LOCAL_WRITE_PATH=docker_pages - volumes: - - "./conf/database_config.dev.yml:/code/erfgoedbot/database_config.yml" - -db: - extends: - file: docker-compose-base.yml - service: db_empty - -web: - extends: - file: docker-compose-base.yml - service: web - links: - - db - volumes: - - .:/var/www/ diff --git a/docker-compose-dump.yml b/docker-compose-dump.yml new file mode 100644 index 0000000..f178c0d --- /dev/null +++ b/docker-compose-dump.yml @@ -0,0 +1,21 @@ +web: + extends: + file: docker-compose-base.yml + service: web + links: + - db + volumes: + - ./api:/var/www/html/api + - ./common:/var/www/html/common + - ./html/index.html:/var/www/html/index.php + - ./layar:/var/www/html/layar + - ./maintenance:/var/www/html/maintenance + - ./map:/var/www/html/map + - ./toolbox:/var/www/html/toolbox + - ./toolinfo.json:/var/www/html/toolinfo.json + - ./tools:/var/www/html/tools + +db: + extends: + file: docker-compose-base.yml + service: db_dump diff --git a/docker-compose.yml b/docker-compose.yml index f178c0d..b4ed95b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,17 @@ +bot: + extends: + file: docker-compose-base.yml + service: bot + links: + - db + volumes: + - "./conf/database_config.dev.yml:/code/erfgoedbot/database_config.yml" + +db: + extends: + file: docker-compose-base.yml + service: db_empty + web: extends: file: docker-compose-base.yml @@ -5,17 +19,4 @@ links: - db volumes: - - ./api:/var/www/html/api - - ./common:/var/www/html/common - - ./html/index.html:/var/www/html/index.php - - ./layar:/var/www/html/layar - - ./maintenance:/var/www/html/maintenance - - ./map:/var/www/html/map - - ./toolbox:/var/www/html/toolbox - - ./toolinfo.json:/var/www/html/toolinfo.json - - ./tools:/var/www/html/tools - -db: - extends: - file: docker-compose-base.yml - service: db_dump + - .:/var/www/ -- To view, visit https://gerrit.wikimedia.org/r/379744 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dfe21fd4b6e0b0ae87f9e0cf302cac4a32a2bb7 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/heritage Gerrit-Branch: master Gerrit-Owner: Jean-Frédéric <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
