Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
#UI ENV
REACT_APP_TITLE=
REACT_APP_DESCRIPTION_CONTENT=
#MANIFEST
REACT_APP_MANIFEST_FILE=
#API CONFIG
REACT_APP_API_BASE_URL=
REACT_APP_CLIENT_ID=
REACT_APP_LOGIN_CLIENT_ID=
REACT_APP_CLIENT_SECRET=
REACT_APP_CLIENT_SECRET=
#LANGUAGES
REACT_APP_MULTI_LANGS_SUPPORT=
REACT_APP_PRELOAD_LANG=
REACT_APP_LANGS_SUPPORT=
#DEFAULT THEME
REACT_APP_DEFAULT_THEME=
#SYSTEM_EMAIL
REACT_APP_SYSTEM_EMAIL_ADDRESS=
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM node:lts-fermium AS build
COPY . /web-app
WORKDIR /web-app
ENV NODE_ENV production
RUN yarn cache clean
RUN yarn install --immutable
ARG GENERATE_SOURCEMAP='false'
ENV GENERATE_SOURCEMAP $GENERATE_SOURCEMAP
Expand All @@ -13,4 +14,4 @@ COPY --from=build /web-app/build /var/www/opex/html
WORKDIR /var/www/opex/html
COPY env-map.js .
CMD cat env-map.js | envsubst > env.js && nginx -g "daemon off;"
EXPOSE 80
EXPOSE 80
8 changes: 8 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@ services:
image: ghcr.io/opexdev/web-app
environment:
- ENV=$WEB_APP_ENV
- APP_TITLE=$WEB_APP_TITLE
- DESCRIPTION=$WEB_APP_DESCRIPTION
- API_BASE_URL=$API_BASE_URL
- CLIENT_ID=$CLIENT_ID
- LOGIN_CLIENT_ID=$CLIENT_LOGIN_ID
- CLIENT_SECRET=$CLIENT_SECRET
- MULTI_LANGS_SUPPORT=$MULTI_LANGS_SUPPORT
- PRELOAD_LANG=$PRELOAD_LANG
- LANGS_SUPPORT=$LANGS_SUPPORT
- DEFAULT_THEME=$DEFAULT_THEME
- REGISTER_EMAIL_ADDRESS=$REGISTER_EMAIL_ADDRESS
networks:
- default
deploy:
Expand Down
10 changes: 9 additions & 1 deletion env-map.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
window.env = {
REACT_APP_ENV: "$ENV",
REACT_APP_TITLE: "$APP_TITLE",
REACT_APP_DESCRIPTION_CONTENT: "$DESCRIPTION",
REACT_APP_API_BASE_URL: "$API_BASE_URL",
REACT_APP_LOGIN_CLIENT_ID: "$CLIENT_ID",
REACT_APP_CLIENT_ID: "$CLIENT_ID",
REACT_APP_CLIENT_SECRET: "$CLIENT_SECRET"
REACT_APP_CLIENT_SECRET: "$CLIENT_SECRET",
REACT_APP_MULTI_LANGS_SUPPORT : "$MULTI_LANGS_SUPPORT",
REACT_APP_PRELOAD_LANG : "$PRELOAD_LANG",
REACT_APP_LANGS_SUPPORT : "$LANGS_SUPPORT",
REACT_APP_DEFAULT_THEME : "$DEFAULT_THEME",
REACT_APP_SYSTEM_EMAIL_ADDRESS : "$REGISTER_EMAIL_ADDRESS",
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opex",
"version": "v1.0.2-beta.3",
"version": "v1.0.2-beta.4",
"homepage": "",
"private": true,
"dependencies": {
Expand Down
File renamed without changes.
Loading