Skip to content

Commit

Permalink
build: change platform tags env name, fix prod build
Browse files Browse the repository at this point in the history
  • Loading branch information
TheChristophe committed Jan 16, 2024
1 parent 1329a45 commit 72781fb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .env-example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ FRONTEND_OIDC_CLIENT_ID=ccweb
FRONTEND_API=/api/latest
FRONTEND_REDIRECT_HOST=https://localhost

## if using the frontend as a standalone app for another api server, you may set the platform tags below
## separated by commas, ex.: ai4eosc,foo,bar
FRONTEND_PLATFORM_TAGS=

# oauth authority to use
OAUTH_AUTHORITY="https://aai-demo.egi.eu/auth/realms/egi/"

Expand Down Expand Up @@ -38,6 +42,3 @@ PGADMIN_PASSWORD=change_this_password

## API secret for database endpoints
ADMIN_SECRET=change_this_secret

## if using the frontend as a standalone app for another api server, you may set the platform tags below
PLATFORM_TAGS=
2 changes: 1 addition & 1 deletion docker-compose.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
NEXT_PUBLIC_OIDC_REDIRECT_HOST: ${FRONTEND_REDIRECT_HOST}
NEXT_PUBLIC_OIDC_CLIENT_ID: ${FRONTEND_OIDC_CLIENT_ID}
NEXT_PUBLIC_TEMPLATE_REPOSITORY: ${REPOSITORY_URL}
NEXT_PUBLIC_FORCED_TAGS: ${PLATFORM_TAGS}
NEXT_PUBLIC_FORCED_TAGS: ${FRONTEND_PLATFORM_TAGS}
labels:
traefik.http.routers.webapp.rule: Host(`${DOMAIN}`)

Expand Down
1 change: 1 addition & 0 deletions docker-compose.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
OIDC_REDIRECT_HOST: ${FRONTEND_REDIRECT_HOST}
OIDC_CLIENT_ID: ${FRONTEND_OIDC_CLIENT_ID}
REPOSITORY_URL: ${REPOSITORY_URL}
FORCED_TAGS: ${FRONTEND_PLATFORM_TAGS}
labels:
traefik.http.routers.webapp.tls: true
traefik.http.routers.webapp.tls.certResolver: letsEncrypt
Expand Down
2 changes: 2 additions & 0 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ ARG OIDC_CLIENT_ID
ENV NEXT_PUBLIC_OIDC_CLIENT_ID=${OIDC_CLIENT_ID}
ARG REPOSITORY_URL
ENV NEXT_PUBLIC_TEMPLATE_REPOSITORY=${REPOSITORY_URL}
ARG FORCED_TAGS
ENV NEXT_PUBLIC_FORCED_TAGS=${FORCED_TAGS}

RUN yarn build

Expand Down

0 comments on commit 72781fb

Please sign in to comment.