Skip to content

Make environment configurable using environment variables #52

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

Merged
merged 1 commit into from
Nov 4, 2021
Merged

Make environment configurable using environment variables #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions Dockerfile-prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN npm install -g @angular/cli@7.3.9
COPY . /app

# Build the project and copy the files
RUN npm run ng build -- --deploy-url=/ --prod
RUN npm run ng build -- --deploy-url=/ --c production

FROM bitnami/nginx:latest

Expand All @@ -37,7 +37,17 @@ COPY ./.nginx/nginx.conf /opt/bitnami/nginx/conf/server_blocks/frontend.conf
# Copy from the stahg 1
COPY --from=builder /app/dist/OS2IoT-frontend /app

## Change user to perform privileged actions
USER 0
# Install envsubst
RUN apt-get update && apt-get install -y gettext-base
# Make sure we have write access to the env.js file without using the root user
RUN chown 1001 /app/assets/env.js
# Revert to the original non-root user
USER 1001

EXPOSE 8080
EXPOSE 8081

ENTRYPOINT ["nginx", "-g", "daemon off;"]
# Substiture placeholders in env.template.js using environment variables overwrite env.js
CMD ["/bin/sh", "-c", "envsubst < /app/assets/env.template.js > /app/assets/env.js && exec nginx -g 'daemon off;'"]
6 changes: 0 additions & 6 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand Down
7 changes: 7 additions & 0 deletions src/assets/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// This file will be overwritten when running in Docker using env.template.js and envsubst
(function (window) {
window["env"] = window["env"] || {};
window["env"].PRODUCTION = false;
window["env"].BASE_URL = 'http://localhost:3000/api/v1/'; // For local testing
window["env"].TABLE_PAGE_SIZE = 20; // For local testing
})(this);
7 changes: 7 additions & 0 deletions src/assets/env.template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Variables in this file will be substituted using envsubst
(function (window) {
window["env"] = window["env"] || {};
window["env"].PRODUCTION = "${PRODUCTION}";
window["env"].BASE_URL = "${BASE_URL}";
window["env"].TABLE_PAGE_SIZE = "${TABLE_PAGE_SIZE}";
})(this);
5 changes: 0 additions & 5 deletions src/environments/environment.prod.ts
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions src/environments/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.

// "env" is defined in env.js and facilitates dynamic configurations using environment variables
export const environment = {
production: false,
baseUrl: 'http://localhost:3000/api/v1/',
tablePageSize: 20,
production: window["env"].PRODUCTION === "true",
baseUrl: window["env"].BASE_URL,
tablePageSize: parseInt(window["env"].TABLE_PAGE_SIZE) || 20
};

/*
Expand Down
1 change: 1 addition & 0 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<meta name="theme-color" content="#ffffff">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<script src="assets/env.js"></script>
</head>

<body>
Expand Down