fix(fullstack): Use platform linux/amd64 for image building, some env var fixes
This commit is contained in:
@@ -100,6 +100,7 @@ jobs:
|
||||
context: .
|
||||
file: ./legalconsenthub-backend/Dockerfile
|
||||
push: ${{ gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' }}
|
||||
platforms: linux/amd64
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
|
||||
@@ -94,6 +94,7 @@ jobs:
|
||||
context: .
|
||||
file: ./legalconsenthub/Dockerfile
|
||||
push: ${{ gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' }}
|
||||
platforms: linux/amd64
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
|
||||
@@ -3,11 +3,10 @@ spring:
|
||||
name: legalconsenthub
|
||||
|
||||
datasource:
|
||||
hikari:
|
||||
auto-commit: false
|
||||
url: jdbc:h2:mem:legalconsenthub-database
|
||||
username: user
|
||||
password: pw
|
||||
url: ${LEGALCONSENTHUB_DB_URL}
|
||||
username: ${LEGALCONSENTHUB_DB_APP_USER}
|
||||
password: ${LEGALCONSENTHUB_DB_PASSWORD}
|
||||
|
||||
jpa:
|
||||
show-sql: true
|
||||
@@ -36,5 +35,5 @@ spring:
|
||||
oauth2:
|
||||
resourceserver:
|
||||
jwt:
|
||||
issuer-uri: http://localhost:7080/realms/legalconsenthub
|
||||
jwk-set-uri: http://localhost:7080/realms/legalconsenthub/protocol/openid-connect/certs
|
||||
issuer-uri: ${SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI}
|
||||
jwk-set-uri: ${SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI}
|
||||
|
||||
@@ -6,7 +6,8 @@ export default defineNuxtConfig({
|
||||
public: {
|
||||
clientProxyBasePath: 'NOT_SET',
|
||||
serverApiBaseUrl: 'NOT_SET',
|
||||
serverApiBasePath: 'NOT_SET'
|
||||
serverApiBasePath: 'NOT_SET',
|
||||
keycloakTokenUrl: 'http://localhost:7080/realms/legalconsenthub/protocol/openid-connect/token'
|
||||
},
|
||||
oauth: {
|
||||
keycloak: {
|
||||
|
||||
@@ -11,9 +11,7 @@ export default eventHandler(async (event) => {
|
||||
}
|
||||
|
||||
try {
|
||||
const { access_token, refresh_token } = await $fetch<OAuthTokenResponse>(
|
||||
`http://localhost:7080/realms/legalconsenthub/protocol/openid-connect/token`,
|
||||
{
|
||||
const { access_token, refresh_token } = await $fetch<OAuthTokenResponse>(config.public.keycloakTokenUrl, {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/x-www-form-urlencoded' },
|
||||
body: new URLSearchParams({
|
||||
@@ -22,8 +20,7 @@ export default eventHandler(async (event) => {
|
||||
client_secret: config.oauth.keycloak.clientSecret,
|
||||
refresh_token: session.jwt.refreshToken
|
||||
}).toString()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
await setUserSession(event, {
|
||||
jwt: {
|
||||
|
||||
Reference in New Issue
Block a user