Skip to content
Snippets Groups Projects
Verified Commit c5a47b03 authored by Martin Weise's avatar Martin Weise
Browse files

Replaced image:

- Metadata database can be scaled
parent f92f353c
No related branches found
No related tags found
2 merge requests!163Relase 1.3.0,!162Resolve "Improve Semantic Service handling"
DBREPO_CLIENT_ID="dbrepo-client"
DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG" DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG"
JWT_ISSUER="http://localhost/realms/dbrepo" JWT_ISSUER="http://localhost/realms/dbrepo"
JWT_PUBKEY="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB" JWT_PUBKEY="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB"
JWT_CERT="MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=" JWT_CERT="MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk="
SHARED_FILESYSTEM=/tmp SHARED_FILESYSTEM=/tmp
LOG_LEVEL=trace
ELASTIC_PASSWORD=elastic ELASTIC_PASSWORD=elastic
METADATA_DB=fda METADATA_DB=fda
METADATA_USERNAME=root METADATA_USERNAME=root
...@@ -15,7 +15,6 @@ KEYCLOAK_ADMIN_PASSWORD=fda ...@@ -15,7 +15,6 @@ KEYCLOAK_ADMIN_PASSWORD=fda
BROKER_CONSUMERS=2 BROKER_CONSUMERS=2
WEBSITE=http://localhost WEBSITE=http://localhost
GATEWAY_ENDPOINT=http://gateway-service GATEWAY_ENDPOINT=http://gateway-service
TOKEN_MAX=5
LOG_LEVEL=trace # error, warning, info, debug, trace LOG_LEVEL=trace # error, warning, info, debug, trace
DOI_URL="https://doi.org" DOI_URL="https://doi.org"
DATACITE_URL="https://api.datacite.org" DATACITE_URL="https://api.datacite.org"
......
...@@ -19,11 +19,7 @@ RUN mvn -q clean package -DskipTests ...@@ -19,11 +19,7 @@ RUN mvn -q clean package -DskipTests
RUN mvn -q clean install > /dev/null RUN mvn -q clean install > /dev/null
###### SECOND STAGE ###### ###### SECOND STAGE ######
FROM mariadb:10.5 as runtime FROM bitnami/mariadb:10.5 as runtime
# install curl for prometheus metrics
RUN apt-get update && apt-get install -y curl
RUN cd /tmp && curl -LO https://github.com/prometheus/node_exporter/releases/download/v0.18.1/node_exporter-0.18.1.linux-amd64.tar.gz && tar -xvf node_exporter-0.18.1.linux-amd64.tar.gz && mv node_exporter-0.18.1.linux-amd64/node_exporter /usr/local/bin/
ENV METADATA_DB=fda ENV METADATA_DB=fda
ENV METADATA_USERNAME=root ENV METADATA_USERNAME=root
...@@ -32,16 +28,12 @@ ENV MARIADB_DATABASE="${METADATA_DB}" ...@@ -32,16 +28,12 @@ ENV MARIADB_DATABASE="${METADATA_DB}"
ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}" ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}"
# force lower-case table names # force lower-case table names
COPY ./51-dbrepo.cnf /etc/mysql/mariadb.conf.d/51-dbrepo.cnf COPY ./51-dbrepo.cnf /opt/bitnami/mariadb/conf/my_custom.cnf
# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service # Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
COPY ./setup-schema.sql /docker-entrypoint-initdb.d/setup-schema.sql COPY ./setup-schema.sql /docker-entrypoint-initdb.d/setup-schema.sql
COPY ./setup-node-exporter.sh /docker-entrypoint-initdb.d/setup-node-exporter.sh
RUN chmod +x /docker-entrypoint-initdb.d/setup-node-exporter.sh
EXPOSE 9100
WORKDIR /app WORKDIR /app
......
...@@ -489,7 +489,8 @@ VALUES ('MIT', 'https://opensource.org/licenses/MIT'), ...@@ -489,7 +489,8 @@ VALUES ('MIT', 'https://opensource.org/licenses/MIT'),
('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode'); ('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) 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'); 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');
INSERT INTO `fda`.`mdb_images_environment_item` (`key`, value, etype, iid) INSERT INTO `fda`.`mdb_images_environment_item` (`key`, value, etype, iid)
VALUES ('ROOT', 'root', 'PRIVILEGED_USERNAME', 1), VALUES ('ROOT', 'root', 'PRIVILEGED_USERNAME', 1),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment