From a70dd4d22d82bb1798829f95600c8e9cdc7e3a8c Mon Sep 17 00:00:00 2001 From: Sam Arbid Date: Mon, 26 Aug 2024 16:34:34 +0200 Subject: [PATCH] db: remove deprecated mysql option * Remove deprcated MySql support --- scripts/wait-for-services.sh | 10 ++------ .../docker-compose.full.yml | 9 +------ .../docker-compose.yml | 9 +------ .../docker-services.yml | 25 ------------------- .../invenio.cfg | 4 --- 5 files changed, 4 insertions(+), 53 deletions(-) diff --git a/scripts/wait-for-services.sh b/scripts/wait-for-services.sh index e83129f..e113fa8 100755 --- a/scripts/wait-for-services.sh +++ b/scripts/wait-for-services.sh @@ -32,14 +32,8 @@ then check_ready "S3" _s3_check fi -if [[ ${COOKIECUTTER_DATABASE} == "mysql" ]] -then - _db_check(){ docker compose exec db bash -c "mysql -p${PROJECT_NAME} -e \"select Version();\"" &>/dev/null; } - check_ready "MySQL" _db_check -else - _db_check(){ docker compose exec --user postgres db bash -c "pg_isready" &>/dev/null; } - check_ready "Postgres" _db_check -fi +_db_check(){ docker-compose exec --user postgres db bash -c "pg_isready" &>/dev/null; } +check_ready "Postgres" _db_check _search_check(){ curl --output /dev/null --silent --head --fail http://localhost:9200 &>/dev/null; } check_ready "OpenSearch" _search_check diff --git a/{{cookiecutter.project_shortname}}/docker-compose.full.yml b/{{cookiecutter.project_shortname}}/docker-compose.full.yml index 5715275..d300a8c 100644 --- a/{{cookiecutter.project_shortname}}/docker-compose.full.yml +++ b/{{cookiecutter.project_shortname}}/docker-compose.full.yml @@ -13,7 +13,7 @@ # - UI application: UWSGI (not exposed) # - API application: UWSGI (not exposed) # - Cache: Redis (exposed port: 6379) -# - DB: (PostgresSQL/MySQL) (exposed port: 5432 or 3306) +# - DB: (PostgresSQL) (exposed port: 5432) # - Message queue: RabbitMQ (exposed ports: 5672, 15672) # - Search platform: (OpenSearch) (exposed ports: 9200, 9600) # - OpenSearch Dashboard/Kibana (view OS/ES indexes) (exposed ports: 5601) @@ -40,17 +40,10 @@ services: extends: file: docker-services.yml service: opensearch-dashboards - {%- if cookiecutter.database == 'postgresql'%} pgadmin: extends: file: docker-services.yml service: pgadmin - {%- elif cookiecutter.database == 'mysql'%} - phpmyadmin: - extends: - file: docker-services.yml - service: phpmyadmin - {%- endif %} {%- endif %} {%- if cookiecutter.file_storage == 'S3'%} s3: diff --git a/{{cookiecutter.project_shortname}}/docker-compose.yml b/{{cookiecutter.project_shortname}}/docker-compose.yml index 4f75cf2..22382cc 100644 --- a/{{cookiecutter.project_shortname}}/docker-compose.yml +++ b/{{cookiecutter.project_shortname}}/docker-compose.yml @@ -9,7 +9,7 @@ # # Following services are included: # - Cache: Redis (exposed port: 6379) -# - DB: (PostgresSQL/MySQL) (exposed port: 5432 or 3306) +# - DB: (PostgresSQL) (exposed port: 5432) # - Message queue: RabbitMQ (exposed ports: 5672, 15672) # - OpenSearch (exposed ports: 9200, 9600) # - Kibana (view ES indexes) (exposed ports: 5601) @@ -36,17 +36,10 @@ services: extends: file: docker-services.yml service: opensearch-dashboards - {%- if cookiecutter.database == 'postgresql'%} pgadmin: extends: file: docker-services.yml service: pgadmin - {%- elif cookiecutter.database == 'mysql'%} - phpmyadmin: - extends: - file: docker-services.yml - service: phpmyadmin - {%- endif %} {%- endif %} {%- if cookiecutter.file_storage == 'S3'%} s3: diff --git a/{{cookiecutter.project_shortname}}/docker-services.yml b/{{cookiecutter.project_shortname}}/docker-services.yml index 0dd5a70..c02aa66 100644 --- a/{{cookiecutter.project_shortname}}/docker-services.yml +++ b/{{cookiecutter.project_shortname}}/docker-services.yml @@ -16,11 +16,7 @@ services: - "INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=redis://cache:6379/4" - "INVENIO_SEARCH_HOSTS=['search:9200']" - "INVENIO_SECRET_KEY=CHANGE_ME" - {%- if cookiecutter.database == 'postgresql'%} - "INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://{{cookiecutter.project_shortname}}:{{cookiecutter.project_shortname}}@db/{{cookiecutter.project_shortname}}" - {%- elif cookiecutter.database == 'mysql'%} - - "INVENIO_SQLALCHEMY_DATABASE_URI=mysql+pymysql://{{cookiecutter.project_shortname}}:{{cookiecutter.project_shortname}}@db/{{cookiecutter.project_shortname}}" - {%- endif %} - "INVENIO_WSGI_PROXIES=2" - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3" frontend: @@ -36,7 +32,6 @@ services: read_only: true ports: - "6379:6379" - {%- if cookiecutter.database == 'postgresql'%} db: image: postgres:14.13 restart: "unless-stopped" @@ -56,26 +51,6 @@ services: PGADMIN_DEFAULT_PASSWORD: "{{cookiecutter.project_shortname}}" volumes: - ./docker/pgadmin/servers.json:/pgadmin4/servers.json - {%- elif cookiecutter.database == 'mysql'%} - db: - image: mysql - restart: "unless-stopped" - environment: - - "MYSQL_ROOT_PASSWORD={{cookiecutter.project_shortname}}" - - "MYSQL_DATABAE={{cookiecutter.project_shortname}}" - - "MYSQL_USER={{cookiecutter.project_shortname}}" - - "MYSQL_PASSWORD={{cookiecutter.project_shortname}}" - ports: - - "3306:3306" - phpmyadmin: - image: phpmyadmin/phpmyadmin - restart: "unless-stopped" - ports: - - '8080:80' - environment: - PMA_HOST: db - MYSQL_ROOT_PASSWORD: {{cookiecutter.project_shortname}} - {%- endif %} mq: image: rabbitmq:3-management restart: "unless-stopped" diff --git a/{{cookiecutter.project_shortname}}/invenio.cfg b/{{cookiecutter.project_shortname}}/invenio.cfg index 84912c9..66cf5fd 100644 --- a/{{cookiecutter.project_shortname}}/invenio.cfg +++ b/{{cookiecutter.project_shortname}}/invenio.cfg @@ -41,11 +41,7 @@ APP_ALLOWED_HOSTS = ['0.0.0.0', 'localhost', '127.0.0.1'] # See https://flask-sqlalchemy.palletsprojects.com/en/2.x/config/ # TODO: Set -{%- if cookiecutter.database == 'postgresql'%} SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://{{cookiecutter.project_shortname}}:{{cookiecutter.project_shortname}}@localhost/{{cookiecutter.project_shortname}}" -{%- elif cookiecutter.database == 'mysql'%} -SQLALCHEMY_DATABASE_URI="mysql+pymysql://{{cookiecutter.project_shortname}}:{{cookiecutter.project_shortname}}@localhost/{{cookiecutter.project_shortname}}" -{%- endif %} # Invenio-App