diff --git a/.env.unix.example b/.env.unix.example index 5e3cb074dc4c043b4a17bfd606ceb852a1f658d5..c378a368782ffa6d5327b8b15fe8edfb2389a499 100644 --- a/.env.unix.example +++ b/.env.unix.example @@ -8,6 +8,8 @@ ELASTIC_PASSWORD=elastic METADATA_DB=fda METADATA_USERNAME=root METADATA_PASSWORD=dbrepo +METADATA_REPLICATION_USER=rep +METADATA_REPLICATION_PASSWORD=rep BROKER_USERNAME=fda BROKER_PASSWORD=fda KEYCLOAK_ADMIN=fda diff --git a/dbrepo-metadata-db/setup-schema.sql b/dbrepo-metadata-db/setup-schema.sql index 0eb04c0fd5d4aa11de5ab2aa99611b5bd72f7d85..782e96e89ddc7d47b59f159457569f039f9df6f9 100644 --- a/dbrepo-metadata-db/setup-schema.sql +++ b/dbrepo-metadata-db/setup-schema.sql @@ -489,8 +489,7 @@ VALUES ('MIT', 'https://opensource.org/licenses/MIT'), ('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode'); INSERT INTO `fda`.`mdb_images` (repository, tag, default_port, dialect, driver_class, jdbc_method) -VALUES ('mariadb', '10.5', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb'), - ('bitnami/mariadb', '10.5', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb'); +VALUES ('bitnami/mariadb', '10.5', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb'); INSERT INTO `fda`.`mdb_images_environment_item` (`key`, value, etype, iid) VALUES ('ROOT', 'root', 'PRIVILEGED_USERNAME', 1), diff --git a/docker-compose.dbrepo2.yml b/docker-compose.dbrepo2.yml index 8395c8a79e1b99fc6c6e4ead1eb3a66312802abb..2ee781b628bb2625ed92ce384d44e170514f3bef 100644 --- a/docker-compose.dbrepo2.yml +++ b/docker-compose.dbrepo2.yml @@ -46,6 +46,33 @@ services: - "9100:9100" env_file: - .env + environment: + MARIADB_REPLICATION_MODE: master + MARIADB_REPLICATION_USER: "${METADATA_REPLICATION_USER}" + MARIADB_REPLICATION_PASSWORD: "${METADATA_REPLICATION_PASSWORD}" + logging: + driver: json-file + + dbrepo-metadata-db-slave: + restart: "no" + hostname: metadata-db-slave + image: bitnami/mariadb:10.5 + networks: + core: + env_file: + - .env + environment: + MARIADB_REPLICATION_MODE: slave + MARIADB_REPLICATION_USER: "${METADATA_REPLICATION_USER}" + MARIADB_REPLICATION_PASSWORD: "${METADATA_REPLICATION_PASSWORD}" + MARIADB_MASTER_HOST: metadata-db + MARIADB_MASTER_PORT_NUMBER: 3306 + MARIADB_MASTER_ROOT_PASSWORD: "${METADATA_PASSWORD}" + depends_on: + - dbrepo-metadata-db + deploy: + mode: replicated + replicas: 3 logging: driver: json-file diff --git a/docker-compose.yml b/docker-compose.yml index d921ef70ef3826540d2ab87199b3b52452a5dc1d..f18117bdf354853418398c218f8f49a1c9458dc9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,14 +11,14 @@ volumes: authentication-service-data: networks: - userdb: - name: userdb + public: + name: public driver: bridge ipam: config: - subnet: 172.30.0.0/16 - public: - name: public + userdb: + name: userdb driver: bridge ipam: config: