Ant frontend container #4531
Open
Ant frontend container #4531
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
passcod
approved these changes
May 12, 2023
|
Probably needs a review from tupaia people |
IgorNadj
reviewed
May 16, 2023
| @@ -50,14 +50,17 @@ COPY ./tsconfig* babel.config.json tsconfig-js.json jest.config-ts.json .eslintr | |||
| # Build and install internal dependencies | |||
There was a problem hiding this comment.
Need to consider index.html as well, it has some templating that looks at env vars
There was a problem hiding this comment.
Good point, the following seems to work, but probably needs to be looked at by someone familair with tupaia.. suggest this be addressed in a seperate PR
diff --git a/packages/web-frontend/public/index.html b/packages/web-frontend/public/index.html
index 78279d1f8..7e0804fec 100644
--- a/packages/web-frontend/public/index.html
+++ b/packages/web-frontend/public/index.html
@@ -13,6 +13,7 @@
/>
<meta property="og:url" content="https://tupaia.org" />
<meta property="og:title" content="Tupaia" />
+ <script src="%PUBLIC_URL%/env-config.js"></script>
<% if (process.env.REACT_APP_DEPLOYMENT_NAME === 'master' ||
process.env.REACT_APP_DEPLOYMENT_NAME === 'main' || process.env.REACT_APP_DEPLOYMENT_NAME ===
IgorNadj
reviewed
May 16, 2023
IgorNadj
reviewed
May 16, 2023
| echo "creating $p/.env-config.js" | ||
| env-js "$tupaia_env_dir/$package/.env" "$p/.env-config.js" | ||
| fi | ||
| done |
There was a problem hiding this comment.
Discussed
const baseUrl = process.env.REACT_APP_CONFIG_SERVER_BASE_URL || window.env.REACT_APP_CONFIG_SERVER_BASE_URL || '...'
There was a problem hiding this comment.
Would be good if this could be looked at by someone familiar with tupaia as part of a separate PR
amenasse
force-pushed
the
ant-frontend-container
branch
from
8d73dd8 to
c0e4235
Compare
Seems to be the blessed yarn way now.
Dockerfile is no longer specific to a particular service
Avoids invalidating layer cache and reduces image bloat. Approach courtesy of @passcod.
Fetching env from LastPass to be handled by a separate container.
Remove the devops package from .dockerignore. Scripts from this package are required by CodeShip services containers. This means the devops package is included in the image, which is a little redundant but most likely harmless. Move the Dockerfile out of devops so changes to the Dockerfile don't invalidate the layer cache unnecessarily.
Co-authored-by: Félix Saparelli <felix@passcod.name>
Frontend packages now handled by frontend.Dockerfile
amenasse
force-pushed
the
ant-frontend-container
branch
from
c0e4235 to
79c8a08
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is based off the branch from #4528 , that should be reviewed and merged first.
Introduces a frontend.Dockerfile which uses the existing nginx configuration to serve the frontend services. The current Dockerfile has been updated to not build the frontend packages.
In hindsight this could probably be combined into a single Dockerfile with different stages for frontend and backend services.
https://docs.docker.com/build/building/multi-stage/#stop-at-a-specific-build-stage
A script is run at boot to copy the .env files mounted at /env into the web root of each package.. this will be fetched by the app on startup (not yet implemented)