Skip to content

Commit 000679b

Browse files
author
An Phi
authored
omnibus: cleanups (#843)
1 parent 3d320f2 commit 000679b

File tree

25 files changed

+137
-94
lines changed

25 files changed

+137
-94
lines changed

.github/workflows/manual__create-new-docker-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
variant:
61-
- full
61+
# NOTE: latest version of Gitlab is significantly more costly to run, making it quite unfeasible to run
62+
# all components in the same container, i.e. we disable full build for now.
63+
# - full
6264
- slim
6365
- slim-dbs
6466
steps:

.github/workflows/manual__publish-docker.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
variant:
16-
- full
16+
# NOTE: latest version of Gitlab is significantly more costly to run, making it quite unfeasible to run
17+
# all components in the same container, i.e. we disable full build for now.
18+
# - full
1719
- slim
1820
- slim-dbs
1921
steps:

.github/workflows/publish-docker-snapshot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
variant:
17-
- full
17+
# NOTE: latest version of Gitlab is significantly more costly to run, making it quite unfeasible to run
18+
# all components in the same container, i.e. we disable full build for now.
19+
# - full
1820
- slim
1921
- slim-dbs
2022
steps:

installers/omnibus/.env

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,5 @@ LEGEND_OMNIBUS_ENGINE_TEMP_DB_PORT=6310
4444
LEGEND_OMNIBUS_SDLC_PORT=6100
4545
LEGEND_OMNIBUS_SDLC_ADMIN_PORT=6101
4646

47-
# Legend Pure IDE
48-
LEGEND_OMNIBUS_PURE_IDE_PORT=9200
49-
5047
# Legend Studio
5148
LEGEND_OMNIBUS_STUDIO_PORT=9000

installers/omnibus/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,13 @@ In addition, it uses [Supervisor](http://supervisord.org/) to launch and manage
7272
- **Legend SDLC:** http://localhost:6900/sdlc (port: 6100)
7373
- **Legend Engine:** http://localhost:6900/engine (port: 6300)
7474
- **Legend Studio:** http://localhost:6900/studio (port: 9000)
75-
- **Legend Pure IDE:** http://localhost:6900/ide (port: 9200)
7675

7776
### Image Variants
7877

7978
The `finos/legend-omnibus` image comes with [several variants](https://github.com/finos/legend/tree/master/installers/omnibus/variants), each designed for a specific use case and comes with different configurations:
8079

8180
- **Full/Standard (finos/legend-omnibus:\<version\>):** This includes all the components, it takes a while longer to run/build as it spins up its own instance of `Gitlab`
82-
- **Slim (finos/legend-omnibus:\<version\>-slim):** This does not include `Gitlab` and `Pure IDE` and allows configuring `Legend SDLC` running mode
81+
- **Slim (finos/legend-omnibus:\<version\>-slim):** This does not include `Gitlab` and allows configuring `Legend SDLC` running mode
8382

8483
#### Options
8584

installers/omnibus/components/engine/config/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ relationalexecution:
5959
org.finos.legend.engine.authentication.LegendDefaultDatabaseAuthenticationFlowProvider
6060
flowProviderConfiguration:
6161
_type: legendDefault
62+
errorhandlingconfiguration:
63+
enabled: true
64+
activatorConfiguration: []
6265
vaults:
6366
- _type: property
6467
location: /app/engine/config/vault.properties
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
deployment:
2+
mode: TEST_IGNORE_FUNCTION_MATCH
3+
logging:
4+
level: error
5+
appenders:
6+
- type: console
7+
logFormat: "%msg\r\n"
8+
#pac4j:
9+
# bypassPaths:
10+
# - "/api/server/v1/info"
11+
# clients:
12+
# - org.pac4j.core.client.direct.AnonymousClient: {}
13+
# mongoSession:
14+
# enabled: false
15+
pac4j:
16+
callbackPrefix: /api/pac4j/login
17+
clients:
18+
- org.pac4j.core.client.direct.AnonymousClient: {}
19+
- org.finos.legend.server.pac4j.gitlab.GitlabPersonalAccessTokenClient:
20+
# name: pat
21+
headerTokenName: legend-test-pat
22+
scheme: https
23+
gitlabHost: gitlab.com
24+
gitlabApiVersion: v4
25+
bypassPaths:
26+
- /api/info
27+
cors:
28+
allowedHeaders:
29+
- X-Requested-With
30+
- Content-Type
31+
- Accept
32+
- Origin
33+
- Access-Control-Allow-Credentials
34+
- x-b3-parentspanid
35+
- x-b3-sampled
36+
- x-b3-spanid
37+
- x-b3-traceid
38+
- legend-test-pat
39+
opentracing:
40+
elastic: ''
41+
zipkin: ''
42+
uri: ''
43+
authenticator:
44+
principal: ''
45+
keytab: ''
46+
swagger:
47+
title: Legend Engine
48+
resourcePackage: org.finos.legend
49+
sessionCookie: LEGEND_ENGINE_JSESSIONID
50+
server:
51+
rootPath: "/api"
52+
applicationConnectors:
53+
- maxRequestHeaderSize: 32KiB
54+
type: http
55+
port: 6300
56+
requestLog:
57+
appenders: []
58+
metadataserver:
59+
pure:
60+
host: 127.0.0.1
61+
port: 8080
62+
alloy:
63+
host: 127.0.0.1
64+
port: 6200
65+
prefix: "/depot/api"
66+
sdlc:
67+
host: localhost
68+
port: 6100
69+
# prefix: "/sdlc"
70+
pac4j:
71+
_type: privateAccessToken
72+
accessTokenHeaderName: legend-test-pat
73+
temporarytestdb:
74+
port: 9092
75+
relationalexecution:
76+
tempPath: "/tmp/"
77+
temporarytestdb:
78+
port: 9092
79+
errorhandlingconfiguration:
80+
enabled: true
81+
activatorConfiguration: []
82+
vaults:
83+
- _type: property
84+
location: temp/test-secret.properties

installers/omnibus/components/nginx/config/nginx.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ http {
4343
proxy_pass http://localhost:${LEGEND_OMNIBUS_SDLC_PORT}/;
4444
}
4545

46-
location /ide/ {
47-
proxy_pass http://localhost:${LEGEND_OMNIBUS_PURE_IDE_PORT}/ide/;
48-
}
49-
5046
location /studio/ {
5147
proxy_pass http://localhost:${LEGEND_OMNIBUS_STUDIO_PORT}/studio/;
5248
}

installers/omnibus/components/nginx/run-nginx.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ sed -i 's~${LEGEND_OMNIBUS_SUPERVISOR_DIRECTORY_SERVER_PORT}~'$LEGEND_OMNIBUS_SU
66
sed -i 's~${LEGEND_OMNIBUS_GITLAB_PORT}~'$LEGEND_OMNIBUS_GITLAB_PORT'~g' /app/nginx/config/nginx.cfg
77
sed -i 's~${LEGEND_OMNIBUS_ENGINE_PORT}~'$LEGEND_OMNIBUS_ENGINE_PORT'~g' /app/nginx/config/nginx.cfg
88
sed -i 's~${LEGEND_OMNIBUS_SDLC_PORT}~'$LEGEND_OMNIBUS_SDLC_PORT'~g' /app/nginx/config/nginx.cfg
9-
sed -i 's~${LEGEND_OMNIBUS_PURE_IDE_PORT}~'$LEGEND_OMNIBUS_PURE_IDE_PORT'~g' /app/nginx/config/nginx.cfg
109
sed -i 's~${LEGEND_OMNIBUS_STUDIO_PORT}~'$LEGEND_OMNIBUS_STUDIO_PORT'~g' /app/nginx/config/nginx.cfg
1110

1211
cat /app/nginx/config/nginx.cfg

installers/omnibus/components/pure-ide/config/config.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)