-
Notifications
You must be signed in to change notification settings - Fork 53
1874 failed attch ios trail #415
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
base: develop
Are you sure you want to change the base?
Changes from all commits
1f02610
4ec0180
6ad56ef
ad7d172
034fd5d
73d5605
8d8b4ac
7cac693
d176986
ab1b21c
ceb996b
ab2f83c
a16ed1c
82bd7e9
a15d4e4
28f7606
9fde736
9a21382
c34e7bc
a5cdf62
14ce234
ea43271
b39cfe4
ec6d165
74da2fb
930caf9
374b143
ee8a058
e874d2d
b88a899
5a84fe9
c9616de
9269ef4
594c1aa
5710519
5c7913a
378e38e
fbd2c9d
33c94d2
e9c3f9a
fdb6e7f
faf9d2d
30b0e03
061496c
7813afe
f433d9d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,38 @@ | ||
| version: "3" | ||
| services: | ||
|
|
||
| mage-db: | ||
| image: bitnami/mongodb:6.0.13 | ||
| image: mongo:6.0.4 | ||
| container_name: mage-db | ||
| ports: | ||
| - 27017:27017 | ||
| volumes: | ||
| - ./database/data:/bitnami/mongodb | ||
| - ./database/log:/opt/bitnami/mongodb/logs | ||
| # Uncomment the following ports block to allow the mongo client on your | ||
| # host machine to connect to MongoDB in the Docker container. | ||
| # ports: | ||
| # - 27017:27017 | ||
|
S-S-T marked this conversation as resolved.
|
||
| - ./database/data:/data/db | ||
| - ./database/log:/data/log | ||
| networks: | ||
| - mage.net | ||
| restart: unless-stopped | ||
|
|
||
| mage-server: | ||
| depends_on: [ mage-db ] | ||
| build: | ||
| context: ./ | ||
| # dockerfile: Dockerfile-debug | ||
| image: mage:local | ||
| # entrypoint: ["./node_modules/.bin/mage.service", "--plugin", "@ngageoint/mage.image.service"] Uncomment to specify new entrypoint commands | ||
| platform: linux/amd64 | ||
| volumes: | ||
| - ./server/resources:/var/lib/mage | ||
| # Comment the ports block to disallow connections directly to the node | ||
| # server when running the mage-web-proxy below. | ||
| - ./web-app/dist:/home/mage/instance/node_modules/@ngageoint/web-app/dist | ||
| ports: | ||
| - 4242:4242 | ||
| # Uncomment to allow debuggers to attach the Node process inside the | ||
| # container on port 14242 | ||
| # - 14242:14242 | ||
| networks: | ||
| - mage.net | ||
| environment: | ||
| MAGE_MONGO_URL: mongodb://mage-db:27017/magedb | ||
| MAGE_MONGO_URL: MAGE_MONGO_URL=mongodb://127.0.0.1:27017/magedb | ||
| # MAGE_MONGO_URL: mongodb://mage-db:27017/magedb | ||
| MAGE_TOKEN_EXPIRATION: "28800" | ||
| # NOTE: default INSECURE salt value, recommend generate new UUID before deployment, **NOT** after deployment | ||
| SFTP_PLUGIN_CONFIG_SALT: "A0E6D3B4-25BD-4DD6-BBC9-B367931966AB" | ||
|
|
||
| # Uncomment the following block to enable the TLS reverse proxy. You will | ||
| # also need to generate the key and certificate as the README describes. | ||
| # mage-web-proxy: | ||
| # image: nginx | ||
| # volumes: | ||
| # - ./web/nginx.conf:/etc/nginx/nginx.conf | ||
| # - ./web/mage-web.crt:/etc/nginx/ssl/web.crt | ||
| # - ./web/mage-web.key:/etc/nginx/ssl/web.key | ||
| # ports: | ||
| # - 4280:80 | ||
| # - 4243:4243 | ||
| # networks: | ||
| # - mage.net | ||
|
S-S-T marked this conversation as resolved.
|
||
| CLAM_AV_URL: tcp://host.docker.internal:3310 # Mac host connection for ClamAV | ||
| restart: unless-stopped | ||
|
|
||
| networks: | ||
| mage.net: | ||
| driver: bridge | ||
| driver: bridge | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,12 +24,13 @@ | |
| }, | ||
| "homepage": "https://github.com/ngageoint/mage-server", | ||
| "dependencies": { | ||
| "@ngageoint/mage.arcgis.service": "../plugins/arcgis/service", | ||
| "@ngageoint/mage.arcgis.web-app": "../plugins/arcgis/web-app/dist/main", | ||
| "@ngageoint/mage.sftp.web": "../plugins/sftp/web/dist/main", | ||
| "@ngageoint/mage.sftp.service": "../plugins/sftp/service", | ||
| "@ngageoint/mage.nga-msi": "../plugins/nga-msi", | ||
| "@ngageoint/mage.arcgis.service": "file:../plugins/arcgis/service", | ||
| "@ngageoint/mage.arcgis.web-app": "file:../plugins/arcgis/web-app/dist/main", | ||
| "@ngageoint/mage.nga-msi": "file:../plugins/nga-msi", | ||
| "@ngageoint/mage.service": "../service", | ||
| "@ngageoint/mage.web-app": "../web-app/dist" | ||
| "@ngageoint/mage.sftp.service": "file:../plugins/sftp/service", | ||
| "@ngageoint/mage.sftp.web": "file:../plugins/sftp/web/dist/main", | ||
|
Comment on lines
-27
to
+32
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why change these, is it related to the actual work?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These were pulled in automatically during a rebuild on preceding branch 1756, not an intentional dependency addition. The key commit is
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, so npm install or something changed this to use Why doesn't this "../web-app/dist" get the same treatment? Does it break something in the build/install? |
||
| "@ngageoint/mage.web-app": "../web-app/dist", | ||
| "better-sqlite3": "^11.10.0" | ||
| } | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.