-
Notifications
You must be signed in to change notification settings - Fork 39
Nexus #356
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.
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
Nexus #356
Changes from all commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
4ec75c5
updating README and helping nexus run as well as a number of jpro fix…
jlgrock 25dbf55
Fix some configuration to build and run Komet via JPro using docker
besidev 01e8e79
Reverse nginx proxy configuration for `nexus` and `komet` services
besidev 47b27c3
Merge pull request #2 from besidev/fix-docker-jpro-run
jlgrock 551e9ef
adjusting nginx file to work in docker compose
jlgrock 5a3a669
Provide nginx proxy configuration for `komet` service running with JP…
besidev 8111ced
Configure a default `users.ini` file required when running Komet on t…
besidev 6d8325b
Merge pull request #3 from besidev/fix2-docker-jpro-run
jlgrock 84a4b8d
adjusting to use maven wrapper
jlgrock f2ce08e
updates to use path based routing for komet web
jlgrock a6c6c60
increasing font size
jlgrock d6d217f
updating some language and formatting on README
jlgrock 2bae475
Feature/finished/fixed null pointer for submit button enable disable …
swaroopsalvi e92e266
Feature/finished/jpro 109 fix exporting a file prompts the user to en…
besidev 27b3d8e
Change to run reasoner (#328)
emays a42e77f
Feature/finished/iia 1130 (#329)
dholubek 4c92771
Feature/finished/iia 1648 data on the left side of semantic window re…
swaroopsalvi 170ddc4
Feature/finished/iia 1649 bugfix property bump genedit (#331)
dholubek 5862f50
Feature/finished/iia 1471 component default value (#333)
dukke 51e62d7
Better fix to submit and show uncommmitted transactions.
swaroopsalvi b4cf760
Removed unnecessary code
swaroopsalvi 36e2fb4
Feature/finished/iia 1417 new semantic from pattern window (#334)
dholubek edc4473
Feature/finished/iia 1579 semantic title (#336)
dholubek 0e76369
Feature/finished/jpro 111 fix npe in popover ocurring randomly on sho…
besidev a0ec4e7
Feature/finished/iia 1408 new semantic no selection made (#338)
dholubek f2f3917
Update version to start feature: IIA-1589-concept-pattern-toggle
bhharsh13 a5438f7
IIA-1484 Create Properties Panel Page to Add Reference Component When…
bhharsh13 796238e
Fixed Concepts Patterns toggle on double click
bhharsh13 9965946
Update version to finish feature: IIA-1589-concept-pattern-toggle
bhharsh13 03adcf1
moved the code to generic method
bhharsh13 7edc023
Feature/finished/iia-1467 iia-1468 iia-1469 iia-1670 placeholder (#340)
dukke 6969cb7
IIA-1590 - Clear function implementation for Next gen search pane (#339)
bhharsh13 02966b7
Feature/finished/iia 1646 correct image check (#343)
dukke 1887bb2
Update version to start feature: IIA-1471-Uncomment-code
dukke 74c72b8
Feature/IIA-1471: Uncomment commented out code
dukke 5cb0aad
Update version to finish feature: IIA-1471-Uncomment-code
dukke bf1584b
Feature/IIA-1471: adding spaces in appropriate places
dukke 0a862a6
Feature/finished/iia 1130 default values (#344)
dholubek 4698de0
Feature/finished/jpro 106 implement show more show less for other nam…
indritbeqiri 00bca00
Feature/finished/jpro 118 standardize semantic window backgrounds rem…
besidev 1acebc0
Feature/finished/iia 1645 reordering list submit (#347)
dukke 4c52da8
Feature/iia 1579 semantic title (#348)
dholubek 55cd24c
Feature/finished/IIA-1655 AND IIA-1687 AND IIA-1626: set reordering …
dukke 1649d6c
Feature/finished/iia 1684 component integer min value (#351)
dukke 6b06c0c
Update release version: 1.49.0
ikmdevops 1331f1c
Update development version: 1.50.0-SNAPSHOT
ikmdevops e0ee056
Merge branch 'main' into nexus
jlgrock 17aca65
Merge branch 'main' into nexus
dholubek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| README.md | ||
| **/.git |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
File renamed without changes
File renamed without changes
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| services: | ||
| nexus: | ||
| image: sonatype/nexus3 | ||
| container_name: nexus | ||
| volumes: | ||
| - nexus-data:/nexus-data | ||
| healthcheck: | ||
| test: ["CMD", "curl", "-f", "http://localhost:8081/"] | ||
| interval: 30s | ||
| timeout: 10s | ||
| retries: 3 | ||
| networks: | ||
| - rapidenv | ||
| restart: unless-stopped | ||
| logging: | ||
| driver: "json-file" | ||
| options: | ||
| max-size: "10m" | ||
| max-file: "3" | ||
|
|
||
| gitea: | ||
| image: gitea/gitea:latest | ||
| container_name: gitea | ||
| environment: | ||
| - USER_UID=1000 | ||
| - USER_GID=1000 | ||
| - GITEA__database__DB_TYPE=sqlite3 | ||
| - GITEA__database__PATH=/data/gitea/gitea.db | ||
| - GITEA__security__INSTALL_LOCK=true | ||
| - GITEA__security__SECRET_KEY=your_secret_key | ||
| - GITEA__server__DOMAIN=localhost | ||
| - GITEA__server__ROOT_URL=http://localhost/git/ | ||
| - GITEA__admin__USER=admin | ||
| - GITEA__admin__PASSWORD=admin | ||
| - GITEA__admin__EMAIL=admin@example.com | ||
| ports: | ||
| - "3000:3000" | ||
| - "2222:22" | ||
| volumes: | ||
| - gitea_data:/data | ||
| networks: | ||
| - rapidenv | ||
| restart: always | ||
|
|
||
| komet: | ||
| build: | ||
| context: . | ||
| dockerfile: docker/Dockerfile-komet-web | ||
| container_name: komet | ||
| volumes: | ||
| - ~/Solor:/root/Solor | ||
| - ./docker/komet-data/users.ini:/root/Solor/users.ini:ro | ||
| healthcheck: | ||
| test: ["CMD", "curl", "-f", "http://localhost:8080/status/alive"] | ||
| interval: 30s | ||
| timeout: 10s | ||
| retries: 3 | ||
| networks: | ||
| - rapidenv | ||
| restart: unless-stopped | ||
| logging: | ||
| driver: "json-file" | ||
| options: | ||
| max-size: "10m" | ||
| max-file: "3" | ||
|
|
||
| nginx: | ||
| build: | ||
| context: . | ||
| dockerfile: docker/Dockerfile-nginx | ||
| container_name: nginx | ||
| ports: | ||
| - "80:80" | ||
| volumes: | ||
| - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro | ||
| - ./docker/nginx-logs:/var/log/nginx | ||
| depends_on: | ||
| - nexus | ||
| - komet | ||
| healthcheck: | ||
| test: ["CMD", "curl", "-f", "http://localhost:80/"] | ||
| interval: 30s | ||
| timeout: 10s | ||
| retries: 3 | ||
| networks: | ||
| - rapidenv | ||
| restart: always | ||
| logging: | ||
| driver: "json-file" | ||
| options: | ||
| max-size: "10m" | ||
| max-file: "3" | ||
|
|
||
| volumes: | ||
| nexus-data: | ||
| komet-data: | ||
| nginx-logs: | ||
| driver: local | ||
| gitea_data: | ||
|
|
||
| networks: | ||
| rapidenv: | ||
| driver: bridge |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| FROM csanchez/maven:3-azulzulu-23-alpine AS builder | ||
|
|
||
| COPY .. /komet/ | ||
|
|
||
| WORKDIR /komet/ | ||
|
|
||
| RUN ls /komet/ | ||
| RUN ./mvnw clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true | ||
| RUN ./mvnw clean -f application -Pjpro jpro:release | ||
|
|
||
| FROM azul/zulu-openjdk-alpine:23-latest | ||
jlgrock marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # Update the package list and install bash (for script compatibility) | ||
| RUN apk update && apk add --no-cache --upgrade bash | ||
|
|
||
| # Install the glibc compatibility library and GTK+ 3.0 required for JPro applications | ||
| RUN apk add --no-cache libc6-compat gtk+3.0 | ||
|
|
||
| # Copy the JPro application to the image | ||
| COPY --from=builder /komet/application/target/komet-jpro.zip /komet-jpro.zip | ||
|
|
||
| # Unzip the JPro application | ||
| RUN unzip /komet-jpro.zip -d /jproserver/ | ||
|
|
||
| # Copy the different default page in, which allows for proxy paths | ||
| WORKDIR /jproserver/komet-jpro/ | ||
|
|
||
| # Start the JPro server | ||
| CMD (cd jproserver/komet-jpro/; ./bin/restart.sh) | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| FROM nginx:1.26.3 | ||
|
|
||
| COPY docker/index.html /usr/share/nginx/html/index.html | ||
| COPY docker/nginx.conf /etc/nginx/nginx.conf |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <title>Development Links</title> | ||
| <style> | ||
| body { | ||
| font-family: Arial, sans-serif; | ||
| font-size: 32px; | ||
| line-height: 1.6; | ||
| background-color: #f4f4f4; | ||
| color: #333; | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| h1 { | ||
| background-color: #333; | ||
| color: #fff; | ||
| padding: 10px 0; | ||
| text-align: center; | ||
| margin: 0; | ||
| } | ||
|
|
||
| ul { | ||
| list-style-type: none; | ||
| padding: 0; | ||
| } | ||
|
|
||
| li { | ||
| background-color: #fff; | ||
| margin: 10px 0; | ||
| padding: 10px; | ||
| border: 1px solid #ddd; | ||
| border-radius: 5px; | ||
| } | ||
|
|
||
| a { | ||
| color: #007bff; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| a:hover { | ||
| text-decoration: underline; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <h1>Development Links</h1> | ||
| <ul> | ||
| <li><a href="/git/">Gitea</a> - a standalone git repository where you can develop your code, data, or extensions. | ||
| This also can act as an external database to Komet. Default administrative login is | ||
| (username: "admin", password: "admin"), but by default, you can register a different user from the UI.</li> | ||
| <li><a href="/nexus/">Nexus</a> - a maven repository, where you can publish your komet data files for sharing. | ||
| Default login is (username: "admin", password: "admin").</li> | ||
| <li><a href="/komet/">Komet Web</a> - the web version of komet, which allows you to access and modify data. | ||
| Default login is (username: kuser, password: kuser123).</li> | ||
| </ul> | ||
| </body> | ||
| </html> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Define users and passwords, roles | ||
| [users] | ||
| kuser = kuser123, user |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| events { | ||
| worker_connections 1024; | ||
| } | ||
|
|
||
| http { | ||
| include /etc/nginx/mime.types; | ||
| default_type application/octet-stream; | ||
|
|
||
| log_format main '$remote_addr - $remote_user [$time_local] "$request" ' | ||
| '$status $body_bytes_sent "$http_referer" ' | ||
| '"$http_user_agent" "$http_x_forwarded_for"'; | ||
|
|
||
| access_log /var/log/nginx/access.log main; | ||
| error_log /var/log/nginx/error.log debug; | ||
|
|
||
| sendfile on; | ||
| keepalive_timeout 65; | ||
|
|
||
| map $http_upgrade $connection_upgrade { | ||
| default upgrade; | ||
| '' close; | ||
| } | ||
|
|
||
| proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=my_cache:10m inactive=60m; | ||
|
|
||
| # Common proxy settings | ||
| proxy_http_version 1.1; | ||
| proxy_set_header Upgrade $http_upgrade; | ||
| proxy_set_header Connection $connection_upgrade; | ||
| proxy_set_header Host $host; | ||
| proxy_set_header X-Real-IP $remote_addr; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header X-Forwarded-Proto $scheme; | ||
| proxy_set_header X-Forwarded-Host $host; | ||
| proxy_set_header X-Forwarded-Port 80; | ||
| proxy_buffering off; | ||
| proxy_read_timeout 86400; | ||
|
|
||
| server { | ||
| listen 80; | ||
| server_name localhost; | ||
|
|
||
| # Serve the static web page | ||
| location / { | ||
| root /usr/share/nginx/html; | ||
| index index.html; | ||
| } | ||
|
|
||
| # Komet paths | ||
| location = /komet { | ||
| if ($args = "") { return 301 /komet/; } | ||
| proxy_pass http://komet:8080/komet; | ||
| } | ||
|
|
||
| # Komet proxy with trailing slash | ||
| location ~ ^/komet/ { | ||
| rewrite ^/komet/(.*) /$1 break; | ||
| proxy_pass http://komet:8080; | ||
| } | ||
|
|
||
| # JPro and app paths | ||
| location ~ ^/(jpro|app)/ { | ||
| proxy_pass http://komet:8080; | ||
| } | ||
|
|
||
| # Nexus proxy | ||
| location /nexus/ { | ||
| proxy_pass http://nexus:8081/; | ||
| proxy_set_header Host $host; | ||
| proxy_set_header X-Real-IP $remote_addr; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header X-Forwarded-Proto $scheme; | ||
| } | ||
|
|
||
| location /git/ { | ||
| client_max_body_size 512M; | ||
| proxy_pass http://gitea:3000/; | ||
| proxy_set_header Connection $http_connection; | ||
| proxy_set_header Upgrade $http_upgrade; | ||
| proxy_set_header Host $host; | ||
| proxy_set_header X-Real-IP $remote_addr; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header X-Forwarded-Proto $scheme; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| # Redirect from port 8080 | ||
| server { | ||
| listen 8080; | ||
| server_name localhost; | ||
|
|
||
| location /komet/ { | ||
| proxy_pass http://komet:8080/; | ||
| proxy_buffering off; | ||
| proxy_set_header X-Real-IP $remote_addr; | ||
| proxy_set_header X-Forwarded-Proto $scheme; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header Host $http_host; | ||
| proxy_set_header Upgrade $http_upgrade; | ||
| proxy_set_header Connection "upgrade"; | ||
| proxy_read_timeout 86400; | ||
| proxy_http_version 1.1; | ||
| } | ||
| } | ||
| } |
Binary file not shown.
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.
Uh oh!
There was an error while loading. Please reload this page.