diff --git a/.github/workflows/docker-push-and-aws-run.yml b/.github/workflows/docker-push-and-aws-run.yml index ef5d200..2f88782 100644 --- a/.github/workflows/docker-push-and-aws-run.yml +++ b/.github/workflows/docker-push-and-aws-run.yml @@ -3,7 +3,7 @@ name: Docker Build and Push & Run AWS on: push: branches: - - main + - develop permissions: contents: read diff --git a/Dockerfile b/Dockerfile index aa275da..226239c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ MYSQL_ROOT_PASSWORD=${SPRING_DATASOURCE_PASSWORD} \ JWT_ISSUER=${JWT_ISSUER} \ JWT_SECRET_KEY=${JWT_SECRET_KEY} \ CLIENT_ID=${CLIENT_ID} \ -CLIENT_SECRET=${CLIENT_SECRET} +CLIENT_SECRET=${CLIENT_SECRET} \ +REDIRECT_URI=${REDIRECT_URI} COPY ${JAR_FILE} prolog.jar -ENTRYPOINT ["java", "-jar", "/prolog.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-jar", "/prolog.jar"] diff --git a/docker-compose.yml b/docker-compose.yml index 7d28dc6..ea2f319 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,9 +26,8 @@ services: SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL} + REDIRECT_URI: ${REDIRECT_URI} JWT_ISSUER: ${JWT_ISSUER} JWT_SECRET_KEY: ${JWT_SECRET_KEY} CLIENT_ID: ${CLIENT_ID} CLIENT_SECRET: ${CLIENT_SECRET} - SPRING_DATASOURCE_DRIVERCLASSNAME: com.mysql.cj.jdbc.Driver - diff --git a/src/main/resources/application-security.yml b/src/main/resources/application-security.yml index 7442385..48ccb8b 100644 --- a/src/main/resources/application-security.yml +++ b/src/main/resources/application-security.yml @@ -14,7 +14,7 @@ spring: client-id: ${CLIENT_ID} client-secret: ${CLIENT_SECRET} scope: profile_nickname, account_email - redirect-uri: "http://localhost:8080/login/oauth2/code/{registrationId}" + redirect-uri: ${REDIRECT_URI} authorization-grant-type: authorization_code client-authentication-method: POST provider: