-
Notifications
You must be signed in to change notification settings - Fork 26
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
refactor: remove unused and outdated files #1624
base: master
Are you sure you want to change the base?
Changes from 1 commit
29b2e95
418dcce
7feee84
308bed7
43f334a
c29b918
c7fd3e3
8a6ceb1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,16 @@ | ||
version: "3.4" | ||
services: | ||
reverse-proxy: | ||
image: traefik:2.5 | ||
image: traefik:2.10 | ||
command: --api.insecure=true --providers.docker=true --entrypoints.web.address=:80 | ||
ports: | ||
- 8080:80 | ||
volumes: | ||
- /var/run/docker.sock:/var/run/docker.sock | ||
mongodb: | ||
image: "bitnami/mongodb:latest" | ||
## As of 2024-10-22 bitnami mongoDB still do not support ARM64 | ||
## Change back to bitnami/mongodb when it supports ARM64 | ||
image: "mongo:latest" | ||
ports: | ||
- "27017:27017" | ||
volumes: | ||
|
@@ -19,60 +21,55 @@ services: | |
timeout: 10s | ||
retries: 5 | ||
start_period: 40s | ||
|
||
scichat-loopback: | ||
image: "ghcr.io/scicatproject/scichat-loopback:e2e" | ||
image: "ghcr.io/scicatproject/scichat-loopback:latest" | ||
command: | ||
[ | ||
"./wait-for-it.sh", | ||
"mongodb:27017", | ||
"--", | ||
"node", | ||
"-r", | ||
"dotenv/config", | ||
"." | ||
] | ||
volumes: | ||
- "./CI/ESS/e2e/.env:/home/node/app/.env" | ||
- "./CI/e2e/.env.scichat-loopback.e2e:/home/node/app/.env" | ||
depends_on: | ||
mongodb: | ||
condition: service_healthy | ||
|
||
backend: | ||
image: ghcr.io/scicatproject/backend-next:latest | ||
command: sh -c "node dist/main" | ||
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. I think the command is part of the image already and could be removed |
||
ports: | ||
- 3000:3000 | ||
volumes: | ||
- "./CI/ESS/e2e/.env.backend-next:/home/node/app/.env" | ||
- "./CI/ESS/e2e/functionalAccounts.json:/home/node/app/functionalAccounts.json" | ||
- "./CI/ESS/e2e/config.e2e.json:/home/node/app/dist/config/frontend.config.json" | ||
- "./CI/e2e/.env.backend.e2e:/home/node/app/.env" | ||
- "./CI/e2e/functionalAccounts.e2e.json:/home/node/app/functionalAccounts.json" | ||
- "./CI/e2e/config.e2e.json:/home/node/app/dist/config/frontend.config.json" | ||
depends_on: | ||
mongodb: | ||
condition: service_healthy | ||
es01: | ||
condition: service_healthy | ||
healthcheck: | ||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/v3/health"] | ||
interval: 30s | ||
timeout: 10s | ||
retries: 5 | ||
labels: | ||
- "traefik.http.routers.backend.rule=PathPrefix(`/api/v3`, `/auth/msad`)" | ||
- "traefik.http.routers.backend.entrypoints=web" | ||
frontend: | ||
build: | ||
context: . | ||
dockerfile: CI/ESS/e2e/Dockerfile.e2e | ||
command: | ||
[ | ||
"./wait-for-it.sh", | ||
"backend:3000", | ||
"--", | ||
"nginx", | ||
"-g", | ||
"daemon off;" | ||
] | ||
dockerfile: Dockerfile | ||
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. Are you sure that we do not need to wait for the service to come on line? 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. I think this line could be removed as |
||
ports: | ||
- 4200:80 | ||
volumes: | ||
- "./CI/ESS/e2e/config.e2e.json:/usr/share/nginx/html/assets/config.json" | ||
- "./CI/ESS/site.png:/usr/share/nginx/html/assets/images/site.png" | ||
- "./CI/ESS/site-logo.png:/usr/share/nginx/html/assets/images/site-logo.png" | ||
- "./CI/ESS/favicon.ico:/usr/share/nginx/html/favicon.ico" | ||
- "./CI/e2e/frontend.config.e2e.json:/usr/share/nginx/html/assets/config.json" | ||
# - "./CI/site.png:/usr/share/nginx/html/assets/images/site.png" | ||
# - "./CI/site-logo.png:/usr/share/nginx/html/assets/images/site-logo.png" | ||
# - "./CI/favicon.ico:/usr/share/nginx/html/favicon.ico" | ||
depends_on: | ||
- backend | ||
labels: | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure I understand what we need traefik for