From 554d178aae23167bf7c2f11fda0164adae07e84f Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 18 Aug 2018 02:36:54 -0400 Subject: [PATCH] Changes required to correct issues during testing --- docker-compose.yml | 20 +++++++++++++++++--- ghost.sql | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cb35282..56ef571 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,6 +33,13 @@ services: depends_on: - mysqldb + fix-mariadb-permissions: + image: 'bitnami/mariadb:latest' + user: root + command: chown -R 1001:1001 /bitnami + volumes: + - "./data/db/mysq:/bitnami/mariadb" + mysqldb: image: bitnami/mariadb:latest container_name: mysql @@ -46,11 +53,11 @@ services: - ALLOW_EMPTY_PASSWORD=no - MARIADB_USER=${MARIADB_USER} - MARIADB_PASSWORD=${MARIADB_PASS} - - MARIADB_DATABASE=bitnami_ghost + - MARIADB_DATABASE=${GHOST_DATABASE_NAME} ports: - "127.0.0.1:3306:3306" volumes: - - "./data/db/mysql:/bitnami/mariadb" + - "./data/db/mysq:/bitnami/mariadb" - "./etc/mariadb/innodb.cnf:/bitnami/mariadb/conf/innodb.cnf:ro" depends_on: - nginx @@ -67,6 +74,13 @@ services: depends_on: - nginx + fix-ghost-permissions: + image: 'bitnami/ghost:latest' + user: root + command: chown -R 1001:1001 /bitnami/ghost + volumes: + - "./etc/ghost:/bitnami/ghost" + ghost: image: bitnami/ghost:latest container_name: ghost @@ -74,7 +88,7 @@ services: - "127.0.0.1:2368:2368" restart: always volumes: - - "./etc:/bitnami" + - "./etc/ghost:/bitnami/ghost" env_file: - ".env" environment: diff --git a/ghost.sql b/ghost.sql index f35fabd..96539f2 100644 --- a/ghost.sql +++ b/ghost.sql @@ -789,7 +789,7 @@ INSERT INTO `settings` (`id`, `key`, `value`, `type`, `created_at`, `created_by` ('5b77985f86ea860079567750', 'navigation', '[{\"label\":\"Home\",\"url\":\"http://localhost/blog\"},{\"label\":\"Play Now\",\"url\":\"http://localhost/blog/play-now/\"},{\"label\":\"Bug Reports\",\"url\":\"http://localhost/blog/bug-reports/\"},{\"label\":\"FAQ\",\"url\":\"http://localhost/blog/faq/\"},{\"label\":\"Our Mission\",\"url\":\"http://localhost/blog/our-mission/\"},{\"label\":\"Future Plans\",\"url\":\"http://localhost/blog/future-plans/\"}]', 'blog', '2018-08-02 22:25:37', '1', '2018-08-18 03:56:12', '1'), ('5b77985f86ea860079567751', 'slack', '[]', 'blog', '2018-08-02 22:25:37', '1', '2018-08-18 03:55:41', '1'), ('5b77985f86ea860079567752', 'unsplash', '{\"isActive\":false}', 'blog', '2018-08-02 22:25:37', '1', '2018-08-04 15:04:26', '1'), -('5b77985f86ea860079567753', 'active_theme', 'newcasper', 'theme', '2018-08-18 03:54:07', '1', '2018-08-18 04:32:14', '1'), +('5b77985f86ea860079567753', 'active_theme', 'casper', 'theme', '2018-08-18 03:54:07', '1', '2018-08-18 04:32:14', '1'), ('5b77985f86ea860079567754', 'active_apps', '[]', 'app', '2018-08-02 22:25:37', '1', '2018-08-02 22:25:37', '1'), ('5b77985f86ea860079567755', 'installed_apps', '[]', 'app', '2018-08-02 22:25:37', '1', '2018-08-02 22:25:37', '1'), ('5b77985f86ea860079567756', 'is_private', 'false', 'private', '2018-08-02 22:25:37', '1', '2018-08-02 22:25:37', '1'),