diff --git a/.github/workflows/pipeline-backend.yaml b/.github/workflows/pipeline-backend.yaml index 3fb7810..10dc085 100644 --- a/.github/workflows/pipeline-backend.yaml +++ b/.github/workflows/pipeline-backend.yaml @@ -92,6 +92,6 @@ jobs: platforms: linux/amd64 tags: ${{ secrets.DOCKERHUB_USERNAME }}/rent-a-tool-backend:${{ steps.extract_version.outputs.VERSION }},${{ secrets.DOCKERHUB_USERNAME }}/rent-a-tool-backend:latest build-args: | - PROFILE=dev + PROFILE=prod APP_VERSION=${{ steps.extract_version.outputs.VERSION }} diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 603c2cf..5b1bd94 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -9,7 +9,7 @@ RUN mvn clean package -DskipTests # Runtime stage FROM amazoncorretto:22.0.2-alpine3.20 -ARG PROFILE=dev +ARG PROFILE=prod ARG APP_VERSION=1.0.0 WORKDIR /app diff --git a/rent-a-tool/pom.xml b/rent-a-tool/pom.xml index 6bb39a8..435a91c 100644 --- a/rent-a-tool/pom.xml +++ b/rent-a-tool/pom.xml @@ -10,7 +10,7 @@ com.numan947 rent-a-tool - 1.0.0 + 1.1.0 rent-a-tool-api The backend of a full-stack application that allows users to manage their tool collections and engage with a community of DIY enthusiasts and professionals. diff --git a/rent-a-tool/src/main/resources/application-dev.yaml b/rent-a-tool/src/main/resources/application-dev.yaml index a74be3b..2cc1aa0 100644 --- a/rent-a-tool/src/main/resources/application-dev.yaml +++ b/rent-a-tool/src/main/resources/application-dev.yaml @@ -15,10 +15,10 @@ spring: database-platform: org.hibernate.dialect.PostgreSQLDialect mail: - host: ${EMAIL_HOST_NAME} - port: 465 - username: ${EMAIL_USER_NAME} - password: ${EMAIL_PASSWORD} + host: localhost + port: 1025 + username: user + password: password properties: mail: smtp: diff --git a/rent-a-tool/src/main/resources/application-prod.yaml b/rent-a-tool/src/main/resources/application-prod.yaml new file mode 100644 index 0000000..a74be3b --- /dev/null +++ b/rent-a-tool/src/main/resources/application-prod.yaml @@ -0,0 +1,50 @@ +spring: + datasource: + url: jdbc:postgresql://localhost:5432/rent_a_tool_db + username: postgres + password: postgres + driver-class-name: org.postgresql.Driver + jpa: + hibernate: + ddl-auto: update + show-sql: false + properties: + hibernate: + format_sql: true + database: postgresql + database-platform: org.hibernate.dialect.PostgreSQLDialect + + mail: + host: ${EMAIL_HOST_NAME} + port: 465 + username: ${EMAIL_USER_NAME} + password: ${EMAIL_PASSWORD} + properties: + mail: + smtp: + auth: true + ssl: + enable: true + trust: "*" + starttls: + enable: true + +application: + file: + uploads: + photos-directory: ./uploads + security: + jwt: + secret-key: 63FDD813AA2A9922746B3EA81DCC1ABCDEFFEDCBA99999FFFDDDEEFF9999FFDDABCDEF + expiration: 86400000 + mailing: + frontend: + activation-url: http://localhost:4200/activate-account + activation-code-length: 6 # in characters + activation-code-expiration: 15 # in minutes + activation-code-characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 + activation-code-subject: Activate your account + cors: + origins: http://localhost:4200,http://localhost:8080 +server: + port: 9999 \ No newline at end of file