diff --git a/.do/app-prod.yml b/.do/app-prod.yml index b3084cc0..0623cbcf 100644 --- a/.do/app-prod.yml +++ b/.do/app-prod.yml @@ -31,16 +31,16 @@ services: envs: - key: DB_HOST scope: RUN_AND_BUILD_TIME - value: ${db.HOSTNAME}:${db.PORT} + value: ${programmingforum.HOSTNAME}:${programmingforum.PORT} - key: DB_NAME scope: RUN_AND_BUILD_TIME - value: ${db.DATABASE} + value: ${programmingforum.DATABASE} - key: DB_USER scope: RUN_AND_BUILD_TIME - value: ${db.USERNAME} + value: ${programmingforum.USERNAME} - key: DB_PASSWORD scope: RUN_AND_BUILD_TIME - value: ${db.PASSWORD} + value: ${programmingforum.PASSWORD} - key: SPRING_PROFILES_ACTIVE scope: RUN_AND_BUILD_TIME value: docker diff --git a/backend/src/main/resources/application-docker.properties b/backend/src/main/resources/application-docker.properties index 785fa2f9..aca6f2cf 100644 --- a/backend/src/main/resources/application-docker.properties +++ b/backend/src/main/resources/application-docker.properties @@ -3,7 +3,7 @@ server.port=8080 jwt.signing.key=413F4428472B4B6250655368566D5970337336763979244226452948404D6351 spring.application.name=cuisines -spring.datasource.url=jdbc:mysql://${DB_HOST}:3306/${DB_NAME}?createDatabaseIfNotExist=true +spring.datasource.url=jdbc:mysql://${DB_HOST}/${DB_NAME}?createDatabaseIfNotExist=true spring.datasource.username=${DB_USER} spring.datasource.password=${DB_PASSWORD} spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/mobile/eas.json b/mobile/eas.json index f87e4f30..8302161f 100644 --- a/mobile/eas.json +++ b/mobile/eas.json @@ -14,8 +14,6 @@ "production": {} }, "submit": { - "production": { - "autoIncrement": true - } + "production": {} } } diff --git a/mobile/package.json b/mobile/package.json index b25a72c2..3f50d224 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -11,7 +11,8 @@ "test": "jest --watchAll", "lint": "expo lint", "generate:api": "openapi-codegen gen programmingForum", - "watch:api": "nodemon --watch '../swagger/openapi.yml' --exec 'yarn generate:api'" + "watch:api": "nodemon --watch '../swagger/openapi.yml' --exec 'yarn generate:api'", + "eas-build-pre-install": "corepack enable" }, "jest": { "preset": "jest-expo"