Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(web): add missing UNSAFE_PLUGIN_URLS and BRAND environment variable #1297

Merged
merged 3 commits into from
Dec 11, 2024
Merged

fix(web): add missing UNSAFE_PLUGIN_URLS and BRAND environment variable #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe40a78
fix(web): add missing UNSAFE_PLUGIN_URLS environment variable
KeisukeYamashita Dec 1, 2024
61e1b62
fix: add missing BRAND
KeisukeYamashita Dec 11, 2024
aa2cfa9
Merge branch 'main' into add-unsafe-plugin-urls-envvar
KeisukeYamashita Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV REEARTH_WEB_API=null
ENV REEARTH_WEB_AUTH0_AUDIENCE=null
ENV REEARTH_WEB_AUTH0_CLIENT_ID=null
ENV REEARTH_WEB_AUTH0_DOMAIN=null
ENV REEARTH_WEB_BRAND=null
ENV REEARTH_WEB_CESIUM_ION_ACCESS_TOKEN=null
ENV REEARTH_WEB_CLOUD_API=null
ENV REEARTH_WEB_CURRENT_TOS=null
Expand All @@ -62,6 +63,7 @@ ENV REEARTH_WEB_PLUGINS=null
ENV REEARTH_WEB_POLICY=null
ENV REEARTH_WEB_PUBLISHED=null
ENV REEARTH_WEB_TITLE=
ENV REEARTH_WEB_UNSAFE_PLUGIN_URLS=[]

COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html
COPY --chown=nginx:nginx docker/nginx.conf.template /etc/nginx/templates/nginx.conf.template
Expand Down
4 changes: 3 additions & 1 deletion web/docker/reearth_config.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"auth0Audience": ${REEARTH_WEB_AUTH0_AUDIENCE},
"auth0ClientId": ${REEARTH_WEB_AUTH0_CLIENT_ID},
"auth0Domain": ${REEARTH_WEB_AUTH0_DOMAIN},
"brand": ${REEARTH_WEB_BRAND},
"cesiumIonAccessToken": ${REEARTH_WEB_CESIUM_ION_ACCESS_TOKEN},
"cloudApi": ${REEARTH_WEB_CLOUD_API},
"currentTos": ${REEARTH_WEB_CURRENT_TOS},
Expand All @@ -16,5 +17,6 @@
"passwordPolicy": ${REEARTH_WEB_PASSWORD_POLICY},
"plugins": ${REEARTH_WEB_PLUGINS},
"policy": ${REEARTH_WEB_POLICY},
"published": ${REEARTH_WEB_PUBLISHED}
"published": ${REEARTH_WEB_PUBLISHED},
"unsafePluginUrls": ${REEARTH_WEB_UNSAFE_PLUGIN_URLS}
}
Loading