Skip to content
Snippets Groups Projects
Commit 13deb252 authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

fix: no docker config by adding env file

parent eaa3a155
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
angular.json
+ 15
− 0
View file @ 13deb252
......@@ -137,6 +137,20 @@
"with": "src/environments/environment.dlcmtest-local.ts"
}
]
},
"no-docker": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.no-docker.ts"
}
]
}
}
},
......@@ -166,6 +180,7 @@
"proxyConfig": "proxy.conf.dlcmtest-local.js"
},
"no-docker": {
"browserTarget": "DLCM-Frontend:build:no-docker",
"proxyConfig": "proxy.conf.no-docker.js"
},
"standalone": {
......
proxy.conf.dlcmtest-local.js
+ 3
− 4
View file @ 13deb252
......@@ -10,10 +10,9 @@ module.exports = {
},
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite":
{
"^/api/short-doi": ""
},
"pathRewrite": {
"^/api/short-doi": ""
},
"changeOrigin": true,
},
"/dlcm/authorization/oauth": {
......
proxy.conf.js
+ 33
− 35
View file @ 13deb252
module.exports = {
"/api/rss": {
"target": "https://www.unige.ch/feed",
"pathRewrite":
{
"^/api": ""
},
"changeOrigin": true
},
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite":
{
"^/api/short-doi": ""
},
"changeOrigin": true,
},
"/dlcm/oauth": {
"target": "http://localhost:16110/dlcm/oauth",
"pathRewrite": {
"^/dlcm/oauth": ""
"/api/rss": {
"target": "https://www.unige.ch/feed",
"pathRewrite": {
"^/api": ""
},
"changeOrigin": true
},
},
"/dlcm/shiblogin": {
"target": "http://localhost:16110",
"onProxyReq": (proxyReq, req, res) => {
proxyReq.setHeader('mail', 'Marty.McFly@unige.ch');
proxyReq.setHeader('persistent-id', '999999@unige.ch');
proxyReq.setHeader('uniqueid', '999999@unige.ch');
proxyReq.setHeader('givenname', 'Marty');
proxyReq.setHeader('surname', 'McFly');
proxyReq.setHeader('homeorganization', 'unige.ch');
proxyReq.setHeader('preferredlanguage', 'fr-ch');
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite": {
"^/api/short-doi": ""
},
"changeOrigin": true,
},
"/dlcm/oauth": {
"target": "http://localhost:16110/dlcm/oauth",
"pathRewrite": {
"^/dlcm/oauth": ""
},
},
"/dlcm/shiblogin": {
"target": "http://localhost:16110",
"onProxyReq": (proxyReq, req, res) => {
proxyReq.setHeader('mail', 'Marty.McFly@unige.ch');
proxyReq.setHeader('persistent-id', '999999@unige.ch');
proxyReq.setHeader('uniqueid', '999999@unige.ch');
proxyReq.setHeader('givenname', 'Marty');
proxyReq.setHeader('surname', 'McFly');
proxyReq.setHeader('homeorganization', 'unige.ch');
proxyReq.setHeader('preferredlanguage', 'fr-ch');
},
"onProxyRes": (proxyRes, req, res) => {
proxyRes.headers['Access-Control-Allow-Origin'] = 'http://localhost:4200';
}
},
"onProxyRes": (proxyRes, req, res) => {
proxyRes.headers['Access-Control-Allow-Origin'] = 'http://localhost:4200';
}
},
}
proxy.conf.no-docker.js
+ 32
− 76
View file @ 13deb252
module.exports = {
"/api/docs": {
"target": "http://localhost:16105/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/admin": {
"target": "http://localhost:16105/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/preservation-planning": {
"target": "http://localhost:16105/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/ingest": {
"target": "http://localhost:16106/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/preingest": {
"target": "http://localhost:16106/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/access": {
"target": "http://localhost:16108/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/archival-storage": {
"target": "http://localhost:16107/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/rss": {
"target": "https://www.unige.ch/feed",
"pathRewrite":
{
"^/api": ""
},
"changeOrigin": true
},
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite":
{
"^/api/short-doi": ""
},
"changeOrigin": true,
},
"/dlcm/oauth": {
"target": "http://localhost:16100/dlcm/oauth",
"pathRewrite": {
"^/dlcm/oauth": ""
"/api/rss": {
"target": "https://www.unige.ch/feed",
"pathRewrite": {
"^/api": ""
},
"changeOrigin": true
},
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite": {
"^/api/short-doi": ""
},
"changeOrigin": true,
},
},
"/dlcm/shiblogin": {
"target": "http://localhost:16100",
"onProxyReq": (proxyReq, req, res) => {
proxyReq.setHeader('mail', 'Marty.McFly@unige.ch');
proxyReq.setHeader('persistent-id', '999999@unige.ch');
proxyReq.setHeader('uniqueid', '999999@unige.ch');
proxyReq.setHeader('givenname', 'Marty');
proxyReq.setHeader('surname', 'McFly');
proxyReq.setHeader('homeorganization', 'unige.ch');
proxyReq.setHeader('preferredlanguage', 'fr-ch');
"/dlcm/oauth": {
"target": "http://localhost:16100/dlcm/oauth",
"pathRewrite": {
"^/dlcm/oauth": ""
},
},
"onProxyRes": (proxyRes, req, res) => {
proxyRes.headers['Access-Control-Allow-Origin'] = 'http://localhost:4200';
"/dlcm/shiblogin": {
"target": "http://localhost:16100",
"onProxyReq": (proxyReq, req, res) => {
proxyReq.setHeader('mail', 'Marty.McFly@unige.ch');
proxyReq.setHeader('persistent-id', '999999@unige.ch');
proxyReq.setHeader('uniqueid', '999999@unige.ch');
proxyReq.setHeader('givenname', 'Marty');
proxyReq.setHeader('surname', 'McFly');
proxyReq.setHeader('homeorganization', 'unige.ch');
proxyReq.setHeader('preferredlanguage', 'fr-ch');
},
"onProxyRes": (proxyRes, req, res) => {
proxyRes.headers['Access-Control-Allow-Origin'] = 'http://localhost:4200';
}
}
}
}
proxy.conf.standalone.js
+ 32
− 76
View file @ 13deb252
module.exports = {
"/api/docs": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/admin": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/preservation-planning": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/ingest": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/preingest": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/access": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/archival-storage": {
"target": "http://localhost:16121/dlcm",
"pathRewrite": {
"^/api": ""
}
},
"/api/rss": {
"target": "https://www.unige.ch/feed",
"pathRewrite":
{
"^/api": ""
},
"changeOrigin": true
},
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite":
{
"^/api/short-doi": ""
},
"changeOrigin": true,
},
"/dlcm/oauth": {
"target": "http://localhost:16120/dlcm/oauth",
"pathRewrite": {
"^/dlcm/oauth": ""
"/api/rss": {
"target": "https://www.unige.ch/feed",
"pathRewrite": {
"^/api": ""
},
"changeOrigin": true
},
"/api/short-doi": {
"target": "http://shortdoi.org",
"pathRewrite": {
"^/api/short-doi": ""
},
"changeOrigin": true,
},
},
"/dlcm/shiblogin": {
"target": "http://localhost:16120",
"onProxyReq": (proxyReq, req, res) => {
proxyReq.setHeader('mail', 'Marty.McFly@unige.ch');
proxyReq.setHeader('persistent-id', '999999@unige.ch');
proxyReq.setHeader('uniqueid', '999999@unige.ch');
proxyReq.setHeader('givenname', 'Marty');
proxyReq.setHeader('surname', 'McFly');
proxyReq.setHeader('homeorganization', 'unige.ch');
proxyReq.setHeader('preferredlanguage', 'fr-ch');
"/dlcm/oauth": {
"target": "http://localhost:16120/dlcm/oauth",
"pathRewrite": {
"^/dlcm/oauth": ""
},
},
"onProxyRes": (proxyRes, req, res) => {
proxyRes.headers['Access-Control-Allow-Origin'] = 'http://localhost:4200';
"/dlcm/shiblogin": {
"target": "http://localhost:16120",
"onProxyReq": (proxyReq, req, res) => {
proxyReq.setHeader('mail', 'Marty.McFly@unige.ch');
proxyReq.setHeader('persistent-id', '999999@unige.ch');
proxyReq.setHeader('uniqueid', '999999@unige.ch');
proxyReq.setHeader('givenname', 'Marty');
proxyReq.setHeader('surname', 'McFly');
proxyReq.setHeader('homeorganization', 'unige.ch');
proxyReq.setHeader('preferredlanguage', 'fr-ch');
},
"onProxyRes": (proxyRes, req, res) => {
proxyRes.headers['Access-Control-Allow-Origin'] = 'http://localhost:4200';
}
}
}
}
src/environments/environment.no-docker.ts 0 → 100644
+ 23
− 0
View file @ 13deb252
import {ThemeEnum} from "@app/shared/enums/theme.enum";
import {defaultEnvironment} from "./environment.defaults";
import {DlcmEnvironment} from "./environment.defaults.model";
import {environmentLocal} from "./environment.local";
export const environment: DlcmEnvironment = {
...defaultEnvironment,
theme: ThemeEnum.dlcm,
useSelfHostedStreamSaverMitm: false,
// Override OAuth2 properties
dummyClientSecret: "123abc",
clientId: "local-dev-angular",
responseType: "token",
scope: "READ",
requireHttps: false,
redirectUrl: window.location.origin,
admin: "http://localhost:16105/dlcm/admin",
//Override properties inside environment.local.ts
...environmentLocal,
};
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment