From efebf424d1b9b7f0468dbf8fd75b7f634002cf9d Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 25 Sep 2023 15:31:09 +0200 Subject: [PATCH] fix: running tenants migration on docker migration container --- docker-compose.prod.yml | 11 +++++++---- docker/migration/Dockerfile | 6 ++++-- docker/migration/start.sh | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 docker/migration/start.sh diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index b7e2e1040..21e9f74c2 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -15,8 +15,8 @@ services: - ./data/logs/nginx/:/var/log/nginx - ./docker/certbot/certs/:/var/certs ports: - - "${PUBLIC_PROXY_PORT:-80}:80" - - "${PUBLIC_PROXY_SSL_PORT:-443}:443" + - '${PUBLIC_PROXY_PORT:-80}:80' + - '${PUBLIC_PROXY_SSL_PORT:-443}:443' tty: true depends_on: - server @@ -71,7 +71,7 @@ services: # Authentication - JWT_SECRET=${JWT_SECRET} - # MongoDB + # MongoDB - MONGODB_DATABASE_URL=mongodb://mongo/bigcapital # Application @@ -92,11 +92,14 @@ services: context: ./ dockerfile: docker/migration/Dockerfile environment: + # Database - DB_HOST=mysql - DB_USER=${DB_USER} - DB_PASSWORD=${DB_PASSWORD} - DB_CHARSET=${DB_CHARSET} - SYSTEM_DB_NAME=${SYSTEM_DB_NAME} + # Tenants databases + - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX} depends_on: - mysql @@ -136,7 +139,7 @@ services: build: context: ./docker/redis expose: - - "6379" + - '6379' volumes: - redis:/data diff --git a/docker/migration/Dockerfile b/docker/migration/Dockerfile index 18f9383d9..162d5039c 100644 --- a/docker/migration/Dockerfile +++ b/docker/migration/Dockerfile @@ -34,5 +34,7 @@ WORKDIR /app/packages/server RUN git clone https://github.com/vishnubob/wait-for-it.git -# Once we listen the mysql port run the migration task. -CMD ["./wait-for-it/wait-for-it.sh", "mysql:3306", "--", "node", "./build/commands.js", "system:migrate:latest"] \ No newline at end of file +ADD docker/migration/start.sh / +RUN chmod +x /start.sh + +CMD ["/start.sh"] \ No newline at end of file diff --git a/docker/migration/start.sh b/docker/migration/start.sh new file mode 100644 index 000000000..5fa9f0c28 --- /dev/null +++ b/docker/migration/start.sh @@ -0,0 +1,5 @@ +# Migrate the master system database. +./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js system:migrate:latest + +# Migrate all tenants. +./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js tenants:migrate:latest \ No newline at end of file