diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index 12a756e..76e13f5 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -33,7 +33,15 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=sha - - name: Build and push Docker image + - name: Build and push development Docker image + uses: docker/build-push-action@v5 + with: + file: ./Dockerfile + push: true + platforms: linux/amd64 + tags: ${{ steps.meta.outputs.tags }},ghcr.io/privateaim/node-ui:dev,ghcr.io/privateaim/node-ui:latest + labels: ${{ steps.meta.outputs.labels }} + - name: Build and push production Docker image uses: docker/build-push-action@v5 with: file: ./prod.Dockerfile diff --git a/nuxt.config.ts b/nuxt.config.ts index b6fb5a6..6b9cd59 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -32,19 +32,18 @@ export default defineNuxtConfig({ clientSecret: process.env .NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_SECRET as string, redirectUri: - process.env.NUXT_PUBLIC_BASE_URL + "/auth/keycloak/callback" || - process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI, - // The auth is different since that is accessed via a frontend client + process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI || + process.env.NUXT_PUBLIC_BASE_URL + "/auth/keycloak/callback", authorizationUrl: - process.env.KEYCLOAK_LOGIN_URL + "/protocol/openid-connect/auth" || - process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_AUTHORIZATION_URL, + process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_AUTHORIZATION_URL || + process.env.KEYCLOAK_LOGIN_URL + "/protocol/openid-connect/auth", tokenUrl: - process.env.KEYCLOAK_SERVICE_URL + "/protocol/openid-connect/token" || - process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_TOKEN_URL, + process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_TOKEN_URL || + process.env.KEYCLOAK_SERVICE_URL + "/protocol/openid-connect/token", userinfoUrl: + process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_USERINFO_URL || process.env.KEYCLOAK_SERVICE_URL + - "/protocol/openid-connect/userinfo" || - process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_USERINFO_URL, + "/protocol/openid-connect/userinfo", exposeAccessToken: true, pkce: false, },