diff --git a/.github/workflows/manual__create-new-docker-release.yml b/.github/workflows/manual__create-new-docker-release.yml index e02c8babe..6b1d76dfa 100644 --- a/.github/workflows/manual__create-new-docker-release.yml +++ b/.github/workflows/manual__create-new-docker-release.yml @@ -58,7 +58,9 @@ jobs: fail-fast: false matrix: variant: - - full + # NOTE: latest version of Gitlab is significantly more costly to run, making it quite unfeasible to run + # all components in the same container, i.e. we disable full build for now. + # - full - slim - slim-dbs steps: diff --git a/.github/workflows/manual__publish-docker.yml b/.github/workflows/manual__publish-docker.yml index b352f9c63..ed7a7a809 100644 --- a/.github/workflows/manual__publish-docker.yml +++ b/.github/workflows/manual__publish-docker.yml @@ -13,7 +13,9 @@ jobs: fail-fast: false matrix: variant: - - full + # NOTE: latest version of Gitlab is significantly more costly to run, making it quite unfeasible to run + # all components in the same container, i.e. we disable full build for now. + # - full - slim - slim-dbs steps: diff --git a/.github/workflows/publish-docker-snapshot.yml b/.github/workflows/publish-docker-snapshot.yml index c549010c1..01089e526 100644 --- a/.github/workflows/publish-docker-snapshot.yml +++ b/.github/workflows/publish-docker-snapshot.yml @@ -14,7 +14,9 @@ jobs: fail-fast: false matrix: variant: - - full + # NOTE: latest version of Gitlab is significantly more costly to run, making it quite unfeasible to run + # all components in the same container, i.e. we disable full build for now. + # - full - slim - slim-dbs steps: diff --git a/installers/omnibus/.env b/installers/omnibus/.env index 357c0f997..08dd86140 100644 --- a/installers/omnibus/.env +++ b/installers/omnibus/.env @@ -44,8 +44,5 @@ LEGEND_OMNIBUS_ENGINE_TEMP_DB_PORT=6310 LEGEND_OMNIBUS_SDLC_PORT=6100 LEGEND_OMNIBUS_SDLC_ADMIN_PORT=6101 -# Legend Pure IDE -LEGEND_OMNIBUS_PURE_IDE_PORT=9200 - # Legend Studio LEGEND_OMNIBUS_STUDIO_PORT=9000 diff --git a/installers/omnibus/README.md b/installers/omnibus/README.md index c728c83ff..95dfd2694 100644 --- a/installers/omnibus/README.md +++ b/installers/omnibus/README.md @@ -72,14 +72,13 @@ In addition, it uses [Supervisor](http://supervisord.org/) to launch and manage - **Legend SDLC:** http://localhost:6900/sdlc (port: 6100) - **Legend Engine:** http://localhost:6900/engine (port: 6300) - **Legend Studio:** http://localhost:6900/studio (port: 9000) -- **Legend Pure IDE:** http://localhost:6900/ide (port: 9200) ### Image Variants 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: - **Full/Standard (finos/legend-omnibus:\):** This includes all the components, it takes a while longer to run/build as it spins up its own instance of `Gitlab` -- **Slim (finos/legend-omnibus:\-slim):** This does not include `Gitlab` and `Pure IDE` and allows configuring `Legend SDLC` running mode +- **Slim (finos/legend-omnibus:\-slim):** This does not include `Gitlab` and allows configuring `Legend SDLC` running mode #### Options diff --git a/installers/omnibus/components/engine/config/config.yml b/installers/omnibus/components/engine/config/config.yml index 1917f8575..31bd49f10 100644 --- a/installers/omnibus/components/engine/config/config.yml +++ b/installers/omnibus/components/engine/config/config.yml @@ -59,6 +59,9 @@ relationalexecution: org.finos.legend.engine.authentication.LegendDefaultDatabaseAuthenticationFlowProvider flowProviderConfiguration: _type: legendDefault +errorhandlingconfiguration: + enabled: true +activatorConfiguration: [] vaults: - _type: property location: /app/engine/config/vault.properties diff --git a/installers/omnibus/components/engine/config/engine-config.yaml b/installers/omnibus/components/engine/config/engine-config.yaml new file mode 100755 index 000000000..23e31b170 --- /dev/null +++ b/installers/omnibus/components/engine/config/engine-config.yaml @@ -0,0 +1,84 @@ +deployment: + mode: TEST_IGNORE_FUNCTION_MATCH +logging: + level: error + appenders: + - type: console + logFormat: "%msg\r\n" +#pac4j: +# bypassPaths: +# - "/api/server/v1/info" +# clients: +# - org.pac4j.core.client.direct.AnonymousClient: {} +# mongoSession: +# enabled: false +pac4j: + callbackPrefix: /api/pac4j/login + clients: + - org.pac4j.core.client.direct.AnonymousClient: {} + - org.finos.legend.server.pac4j.gitlab.GitlabPersonalAccessTokenClient: +# name: pat + headerTokenName: legend-test-pat + scheme: https + gitlabHost: gitlab.com + gitlabApiVersion: v4 + bypassPaths: + - /api/info +cors: + allowedHeaders: + - X-Requested-With + - Content-Type + - Accept + - Origin + - Access-Control-Allow-Credentials + - x-b3-parentspanid + - x-b3-sampled + - x-b3-spanid + - x-b3-traceid + - legend-test-pat +opentracing: + elastic: '' + zipkin: '' + uri: '' + authenticator: + principal: '' + keytab: '' +swagger: + title: Legend Engine + resourcePackage: org.finos.legend +sessionCookie: LEGEND_ENGINE_JSESSIONID +server: + rootPath: "/api" + applicationConnectors: + - maxRequestHeaderSize: 32KiB + type: http + port: 6300 + requestLog: + appenders: [] +metadataserver: + pure: + host: 127.0.0.1 + port: 8080 + alloy: + host: 127.0.0.1 + port: 6200 + prefix: "/depot/api" + sdlc: + host: localhost + port: 6100 +# prefix: "/sdlc" + pac4j: + _type: privateAccessToken + accessTokenHeaderName: legend-test-pat +temporarytestdb: + port: 9092 +relationalexecution: + tempPath: "/tmp/" + temporarytestdb: + port: 9092 +errorhandlingconfiguration: + enabled: true +activatorConfiguration: [] +vaults: + - _type: property + location: temp/test-secret.properties diff --git a/installers/omnibus/components/nginx/config/nginx.cfg b/installers/omnibus/components/nginx/config/nginx.cfg index 47757ef1e..fe198a95e 100644 --- a/installers/omnibus/components/nginx/config/nginx.cfg +++ b/installers/omnibus/components/nginx/config/nginx.cfg @@ -43,10 +43,6 @@ http { proxy_pass http://localhost:${LEGEND_OMNIBUS_SDLC_PORT}/; } - location /ide/ { - proxy_pass http://localhost:${LEGEND_OMNIBUS_PURE_IDE_PORT}/ide/; - } - location /studio/ { proxy_pass http://localhost:${LEGEND_OMNIBUS_STUDIO_PORT}/studio/; } diff --git a/installers/omnibus/components/nginx/run-nginx.sh b/installers/omnibus/components/nginx/run-nginx.sh index be08af9d3..1782117dc 100644 --- a/installers/omnibus/components/nginx/run-nginx.sh +++ b/installers/omnibus/components/nginx/run-nginx.sh @@ -6,7 +6,6 @@ sed -i 's~${LEGEND_OMNIBUS_SUPERVISOR_DIRECTORY_SERVER_PORT}~'$LEGEND_OMNIBUS_SU sed -i 's~${LEGEND_OMNIBUS_GITLAB_PORT}~'$LEGEND_OMNIBUS_GITLAB_PORT'~g' /app/nginx/config/nginx.cfg sed -i 's~${LEGEND_OMNIBUS_ENGINE_PORT}~'$LEGEND_OMNIBUS_ENGINE_PORT'~g' /app/nginx/config/nginx.cfg sed -i 's~${LEGEND_OMNIBUS_SDLC_PORT}~'$LEGEND_OMNIBUS_SDLC_PORT'~g' /app/nginx/config/nginx.cfg -sed -i 's~${LEGEND_OMNIBUS_PURE_IDE_PORT}~'$LEGEND_OMNIBUS_PURE_IDE_PORT'~g' /app/nginx/config/nginx.cfg sed -i 's~${LEGEND_OMNIBUS_STUDIO_PORT}~'$LEGEND_OMNIBUS_STUDIO_PORT'~g' /app/nginx/config/nginx.cfg cat /app/nginx/config/nginx.cfg diff --git a/installers/omnibus/components/pure-ide/config/config.yml b/installers/omnibus/components/pure-ide/config/config.yml deleted file mode 100644 index 898ea9c99..000000000 --- a/installers/omnibus/components/pure-ide/config/config.yml +++ /dev/null @@ -1,23 +0,0 @@ -server: - type: simple - applicationContextPath: "/" - adminContextPath: "/admin" - connector: - maxRequestHeaderSize: 32KiB - type: http - port: ${LEGEND_OMNIBUS_PURE_IDE_PORT} - requestLog: - appenders: [] -sessionCookie: LEGEND_PURE_IDE_JSESSIONID -logging: - level: INFO - appenders: - - type: console - logFormat: "%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%thread] %c - %m%n" -swagger: - resourcePackage: org.finos.legend - title: Legend Pure IDE - uriPrefix: "/" - -sourceLocationConfiguration: - welcomeFileDirectory: "./" diff --git a/installers/omnibus/components/pure-ide/run-pure-ide.sh b/installers/omnibus/components/pure-ide/run-pure-ide.sh deleted file mode 100755 index 4610cdf9c..000000000 --- a/installers/omnibus/components/pure-ide/run-pure-ide.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -java -cp /app/pure-ide/lib/*-shaded.jar \ - -XX:+ExitOnOutOfMemoryError \ - -XX:MaxRAMPercentage=60 \ - -Xss4M \ - -Dfile.encoding=UTF8 \ - org.finos.legend.engine.ide.PureIDELight_NoExtension server /app/pure-ide/config/config.yml diff --git a/installers/omnibus/components/supervisor/check-setup.sh b/installers/omnibus/components/supervisor/check-setup.sh index f99fca42a..2f22787e4 100644 --- a/installers/omnibus/components/supervisor/check-setup.sh +++ b/installers/omnibus/components/supervisor/check-setup.sh @@ -39,11 +39,10 @@ while :; do status_engine=$(curl --write-out %{http_code} --silent --output /dev/null http://localhost:$LEGEND_OMNIBUS_ENGINE_PORT/api/server/v1/info) status_sdlc=$(curl --write-out %{http_code} --silent --output /dev/null http://localhost:$LEGEND_OMNIBUS_SDLC_PORT/api/info) status_sdlc_authenticated=$(curl --header "legend-omnibus-pat: $LEGEND_OMNIBUS_GITLAB_PERSONAL_ACCESS_TOKEN" --write-out %{http_code} --silent --output /dev/null http://localhost:$LEGEND_OMNIBUS_SDLC_PORT/api/currentUser) - status_pure_ide=$(curl --write-out %{http_code} --silent --output /dev/null http://localhost:$LEGEND_OMNIBUS_PURE_IDE_PORT/ide) status_studio=$(curl --write-out %{http_code} --silent --output /dev/null http://localhost:$LEGEND_OMNIBUS_STUDIO_PORT/studio) - if [[ $status_engine -eq 200 ]] && [[ $status_sdlc -eq 200 ]] && [[ $status_sdlc_authenticated -eq 200 ]] && [[ $status_pure_ide -eq 200 ]] && [[ $status_studio -eq 200 ]]; then + if [[ $status_engine -eq 200 ]] && [[ $status_sdlc -eq 200 ]] && [[ $status_sdlc_authenticated -eq 200 ]] && [[ $status_studio -eq 200 ]]; then break - elif [[ $status_engine -ge 300 ]] || [[ $status_sdlc -ge 300 ]] || [[ $status_sdlc_authenticated -ge 300 ]] || [[ $status_pure_ide -ge 300 ]] || [[ $status_studio -ge 300 ]]; then + elif [[ $status_engine -ge 300 ]] || [[ $status_sdlc -ge 300 ]] || [[ $status_sdlc_authenticated -ge 300 ]] || [[ $status_studio -ge 300 ]]; then error=1 break fi @@ -79,7 +78,6 @@ else fi echo -e "Legend SDLC: ${GREEN}${BASE_URL}/sdlc${NC}" echo -e "Legend Engine: ${GREEN}${BASE_URL}/engine${NC}" -echo -e "Legend Pure IDE: ${GREEN}${BASE_URL}/ide${NC}" echo -e "Legend Studio: ${GREEN}${BASE_URL}/studio${NC}" echo -e "\nTo start using Legend, launch Studio at: ${GREEN}${BASE_URL}/studio/${NC}${NC}" cat > /.omnibus-status.json <<-END diff --git a/installers/omnibus/components/supervisor/report-build-info.sh b/installers/omnibus/components/supervisor/report-build-info.sh index eee4c3983..c3c796ea7 100644 --- a/installers/omnibus/components/supervisor/report-build-info.sh +++ b/installers/omnibus/components/supervisor/report-build-info.sh @@ -8,7 +8,6 @@ cat > /.buildinfo.json <<-END "gitlab_version": "$LEGEND_OMNIBUS_GITLAB_VERSION", "sdlc_version": "$LEGEND_OMNIBUS_SDLC_VERSION", "engine_version": "$LEGEND_OMNIBUS_ENGINE_VERSION", - "pure_ide_version": "$LEGEND_OMNIBUS_PURE_IDE_VERSION", "studio_version": "$LEGEND_OMNIBUS_STUDIO_VERSION" } END diff --git a/installers/omnibus/components/supervisor/supervisor.conf b/installers/omnibus/components/supervisor/supervisor.conf index f907dc242..68d813170 100644 --- a/installers/omnibus/components/supervisor/supervisor.conf +++ b/installers/omnibus/components/supervisor/supervisor.conf @@ -35,14 +35,6 @@ stderr_logfile_maxbytes = 0 stdout_logfile=/app/engine/logs/stdout stdout_logfile_maxbytes = 0 -[program:legend_pure_ide] -command=/app/pure-ide/run-pure-ide.sh -autorestart=false -stderr_logfile=/app/pure-ide/logs/stdout -stderr_logfile_maxbytes = 0 -stdout_logfile=/app/pure-ide/logs/stdout -stdout_logfile_maxbytes = 0 - [program:legend_sdlc] command=/app/sdlc/run-sdlc.sh autorestart=false diff --git a/installers/omnibus/variants/example-esg-2023/Dockerfile b/installers/omnibus/variants/example-esg-2023/Dockerfile index 278eb9732..986ec0da6 100644 --- a/installers/omnibus/variants/example-esg-2023/Dockerfile +++ b/installers/omnibus/variants/example-esg-2023/Dockerfile @@ -6,14 +6,14 @@ ARG LEGEND_OMNIBUS_SDLC_VERSION ARG LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION ARG LEGEND_OMNIBUS_STUDIO_VERSION -FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image +FROM finos/legend-engine-server-http-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image # TODO: to be removed when we make SDLC backend configurable # See https://github.com/finos/legend-sdlc/issues/722 FROM finos/legend-sdlc-server-fs:${LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION} AS sdlc-file-system-backend-image -FROM eclipse-temurin:11.0.19_7-jdk-jammy +FROM eclipse-temurin:11.0.25_9-jdk-jammy RUN apt-get update && apt-get install -y wget nano # ---------------- Setup environment ---------------- diff --git a/installers/omnibus/variants/example-ghc-2023/Dockerfile b/installers/omnibus/variants/example-ghc-2023/Dockerfile index 7869c0f4f..b67a5e6e0 100644 --- a/installers/omnibus/variants/example-ghc-2023/Dockerfile +++ b/installers/omnibus/variants/example-ghc-2023/Dockerfile @@ -6,14 +6,14 @@ ARG LEGEND_OMNIBUS_SDLC_VERSION ARG LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION ARG LEGEND_OMNIBUS_STUDIO_VERSION -FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image +FROM finos/legend-engine-server-http-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image # TODO: to be removed when we make SDLC backend configurable # See https://github.com/finos/legend-sdlc/issues/722 FROM finos/legend-sdlc-server-fs:${LEGEND_OMNIBUS_SDLC_DEMO_FILE_SYSTEM_VERSION} AS sdlc-file-system-backend-image -FROM eclipse-temurin:11.0.19_7-jdk-jammy +FROM eclipse-temurin:11.0.25_9-jdk-jammy RUN apt-get update && apt-get install -y wget nano # ---------------- Setup environment ---------------- diff --git a/installers/omnibus/variants/full/Dockerfile b/installers/omnibus/variants/full/Dockerfile index 9e3e2cf04..761fe95c3 100644 --- a/installers/omnibus/variants/full/Dockerfile +++ b/installers/omnibus/variants/full/Dockerfile @@ -3,15 +3,13 @@ ARG LEGEND_OMNIBUS_IMAGE_VERSION ARG LEGEND_OMNIBUS_ENGINE_VERSION ARG LEGEND_OMNIBUS_SDLC_VERSION -ARG LEGEND_OMNIBUS_PURE_IDE_VERSION ARG LEGEND_OMNIBUS_STUDIO_VERSION -FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image +FROM finos/legend-engine-server-http-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image -FROM finos/legend-engine-pure-ide-light:${LEGEND_OMNIBUS_PURE_IDE_VERSION} AS pure-ide-image FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image -FROM eclipse-temurin:11.0.19_7-jdk-jammy +FROM eclipse-temurin:11.0.25_9-jdk-jammy RUN apt-get update && apt-get install -y wget nano # ---------------- Setup environment ---------------- @@ -67,13 +65,6 @@ ENV LEGEND_OMNIBUS_SDLC_VERSION=${LEGEND_OMNIBUS_SDLC_VERSION} ENV LEGEND_OMNIBUS_SDLC_PORT=${LEGEND_OMNIBUS_SDLC_PORT} ENV LEGEND_OMNIBUS_SDLC_ADMIN_PORT=${LEGEND_OMNIBUS_SDLC_ADMIN_PORT} -# Legend Pure IDE -ARG LEGEND_OMNIBUS_PURE_IDE_VERSION -ARG LEGEND_OMNIBUS_PURE_IDE_PORT - -ENV LEGEND_OMNIBUS_PURE_IDE_VERSION=${LEGEND_OMNIBUS_PURE_IDE_VERSION} -ENV LEGEND_OMNIBUS_PURE_IDE_PORT=${LEGEND_OMNIBUS_PURE_IDE_PORT} - # Legend Studio ARG LEGEND_OMNIBUS_STUDIO_VERSION ARG LEGEND_OMNIBUS_STUDIO_PORT @@ -132,16 +123,6 @@ COPY components/sdlc $SDLC_DIR RUN chmod +x $SDLC_DIR/run-sdlc.sh EXPOSE ${LEGEND_OMNIBUS_SDLC_PORT} -# ---------------- Setup Legend Pure IDE ---------------- - -ARG PURE_IDE_DIR=/app/pure-ide -RUN mkdir -p $PURE_IDE_DIR/lib -RUN mkdir -p $PURE_IDE_DIR/logs -COPY --from=pure-ide-image /app/bin/*.jar $PURE_IDE_DIR/lib/ -COPY components/pure-ide $PURE_IDE_DIR -RUN chmod +x $PURE_IDE_DIR/run-pure-ide.sh -EXPOSE ${LEGEND_OMNIBUS_PURE_IDE_PORT} - # ---------------- Setup Legend Studio ---------------- ARG STUDIO_DIR=/app/studio diff --git a/installers/omnibus/variants/full/build.sh b/installers/omnibus/variants/full/build.sh index eb4042f7a..1a7aa0d4b 100644 --- a/installers/omnibus/variants/full/build.sh +++ b/installers/omnibus/variants/full/build.sh @@ -29,9 +29,6 @@ docker build \ --build-arg LEGEND_OMNIBUS_SDLC_PORT=$LEGEND_OMNIBUS_SDLC_PORT \ --build-arg LEGEND_OMNIBUS_SDLC_ADMIN_PORT=$LEGEND_OMNIBUS_SDLC_ADMIN_PORT \ \ - --build-arg LEGEND_OMNIBUS_PURE_IDE_VERSION=$LEGEND_OMNIBUS_PURE_IDE_VERSION \ - --build-arg LEGEND_OMNIBUS_PURE_IDE_PORT=$LEGEND_OMNIBUS_PURE_IDE_PORT \ - \ --build-arg LEGEND_OMNIBUS_STUDIO_VERSION=$LEGEND_OMNIBUS_STUDIO_VERSION \ --build-arg LEGEND_OMNIBUS_STUDIO_PORT=$LEGEND_OMNIBUS_STUDIO_PORT \ \ diff --git a/installers/omnibus/variants/full/publish-snapshot.sh b/installers/omnibus/variants/full/publish-snapshot.sh index 621e64e41..cd9cf1daa 100644 --- a/installers/omnibus/variants/full/publish-snapshot.sh +++ b/installers/omnibus/variants/full/publish-snapshot.sh @@ -11,7 +11,6 @@ NC='\033[0m' # No color sed -i'' -e "s/^LEGEND_OMNIBUS_IMAGE_VERSION.*/LEGEND_OMNIBUS_IMAGE_VERSION=snapshot/" ./.env sed -i'' -e "s/^LEGEND_OMNIBUS_ENGINE_VERSION.*/LEGEND_OMNIBUS_ENGINE_VERSION=snapshot/" ./.env sed -i'' -e "s/^LEGEND_OMNIBUS_SDLC_VERSION.*/LEGEND_OMNIBUS_SDLC_VERSION=snapshot/" ./.env -sed -i'' -e "s/^LEGEND_OMNIBUS_PURE_IDE_VERSION.*/LEGEND_OMNIBUS_PURE_IDE_VERSION=snapshot/" ./.env sed -i'' -e "s/^LEGEND_OMNIBUS_STUDIO_VERSION.*/LEGEND_OMNIBUS_STUDIO_VERSION=snapshot/" ./.env source ./.env diff --git a/installers/omnibus/variants/full/run.sh b/installers/omnibus/variants/full/run.sh index 672cf0b10..76de33aab 100755 --- a/installers/omnibus/variants/full/run.sh +++ b/installers/omnibus/variants/full/run.sh @@ -11,6 +11,5 @@ docker run \ -p $LEGEND_OMNIBUS_GITLAB_PORT:$LEGEND_OMNIBUS_GITLAB_PORT \ -p $LEGEND_OMNIBUS_ENGINE_PORT:$LEGEND_OMNIBUS_ENGINE_PORT \ -p $LEGEND_OMNIBUS_SDLC_PORT:$LEGEND_OMNIBUS_SDLC_PORT \ - -p $LEGEND_OMNIBUS_PURE_IDE_PORT:$LEGEND_OMNIBUS_PURE_IDE_PORT \ -p $LEGEND_OMNIBUS_STUDIO_PORT:$LEGEND_OMNIBUS_STUDIO_PORT \ legend-omnibus:latest diff --git a/installers/omnibus/variants/slim-dbs/Dockerfile b/installers/omnibus/variants/slim-dbs/Dockerfile index 4bb34e0e6..94f9da8e7 100644 --- a/installers/omnibus/variants/slim-dbs/Dockerfile +++ b/installers/omnibus/variants/slim-dbs/Dockerfile @@ -6,14 +6,14 @@ ARG LEGEND_OMNIBUS_SDLC_VERSION ARG LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION ARG LEGEND_OMNIBUS_STUDIO_VERSION -FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image +FROM finos/legend-engine-server-http-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image # TODO: to be removed when we make SDLC backend configurable # See https://github.com/finos/legend-sdlc/issues/722 FROM legenddemo/legend-sdlc-server-demo:${LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION} as sdlc-in-memory-backend-image -FROM eclipse-temurin:11.0.19_7-jdk-jammy +FROM eclipse-temurin:11.0.25_9-jdk-jammy RUN apt-get update && apt-get install -y wget nano # ---------------- Setup environment ---------------- diff --git a/installers/omnibus/variants/slim/Dockerfile b/installers/omnibus/variants/slim/Dockerfile index 3da490b7f..fc30963eb 100644 --- a/installers/omnibus/variants/slim/Dockerfile +++ b/installers/omnibus/variants/slim/Dockerfile @@ -6,14 +6,14 @@ ARG LEGEND_OMNIBUS_SDLC_VERSION ARG LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION ARG LEGEND_OMNIBUS_STUDIO_VERSION -FROM finos/legend-engine-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image +FROM finos/legend-engine-server-http-server:${LEGEND_OMNIBUS_ENGINE_VERSION} AS engine-image FROM finos/legend-sdlc-server:${LEGEND_OMNIBUS_SDLC_VERSION} AS sdlc-image FROM finos/legend-studio:${LEGEND_OMNIBUS_STUDIO_VERSION} AS studio-image # TODO: to be removed when we make SDLC backend configurable # See https://github.com/finos/legend-sdlc/issues/722 FROM legenddemo/legend-sdlc-server-demo:${LEGEND_OMNIBUS_SDLC_DEMO_IN_MEMORY_VERSION} as sdlc-in-memory-backend-image -FROM eclipse-temurin:11.0.19_7-jdk-jammy +FROM eclipse-temurin:11.0.25_9-jdk-jammy RUN apt-get update && apt-get install -y wget nano # ---------------- Setup environment ---------------- diff --git a/scripts/create-new-release.sh b/scripts/create-new-release.sh index 1a4c14613..e0a5211cf 100755 --- a/scripts/create-new-release.sh +++ b/scripts/create-new-release.sh @@ -60,7 +60,6 @@ END sed -i'' -e "s/^LEGEND_OMNIBUS_IMAGE_VERSION.*/LEGEND_OMNIBUS_IMAGE_VERSION=$NEW_VERSION/" ./installers/omnibus/.env sed -i'' -e "s/^LEGEND_OMNIBUS_ENGINE_VERSION.*/LEGEND_OMNIBUS_ENGINE_VERSION=$NEW_ENGINE_VERSION/" ./installers/omnibus/.env sed -i'' -e "s/^LEGEND_OMNIBUS_SDLC_VERSION.*/LEGEND_OMNIBUS_SDLC_VERSION=$NEW_SDLC_VERSION/" ./installers/omnibus/.env -sed -i'' -e "s/^LEGEND_OMNIBUS_PURE_IDE_VERSION.*/LEGEND_OMNIBUS_PURE_IDE_VERSION=$NEW_ENGINE_VERSION/" ./installers/omnibus/.env sed -i'' -e "s/^LEGEND_OMNIBUS_STUDIO_VERSION.*/LEGEND_OMNIBUS_STUDIO_VERSION=$NEW_STUDIO_VERSION/" ./installers/omnibus/.env # --------------------------- Commit Changes ------------------------------ diff --git a/website/src/components/releases.js b/website/src/components/releases.js index 9a4f7fd7d..72517be30 100644 --- a/website/src/components/releases.js +++ b/website/src/components/releases.js @@ -36,7 +36,7 @@ export default function Releases(props) { - + Legend Engine @@ -59,7 +59,7 @@ export default function Releases(props) { {release.core["finos/legend-studio"]} - finos/legend-engine-server: + finos/legend-engine-server-http-server: {release.core["finos/legend-engine-server"]} diff --git a/website/static/402.html b/website/static/402.html new file mode 100644 index 000000000..f712a307b --- /dev/null +++ b/website/static/402.html @@ -0,0 +1,26 @@ + + + + + + + + + + + Page Not Found + + + +
+
402
+
+ +