Skip to content
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.

Sign up for GitHub

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

Jump to bottom

List all images at top #465

Merged
merged 3 commits into from
Jan 17, 2024
Merged

List all images at top #465

merged 3 commits into from
Jan 17, 2024

Conversation

eloiferrer
Copy link
Member

MaRDI Pull Request

Changes:

  • This lists all the docker images at the top of the file
  • Also added a tag to deploy to mardi02

Instructions for PR review:

  • Conceptual Review (Logic etc...)
  • Code Review (Review your implementation)
  • Checkout (Test changes locally)

Checklist for this PR:

physikerwelt
physikerwelt approved these changes Jan 16, 2024
View reviewed changes
Copy link
Member

@physikerwelt physikerwelt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love it. Maybe you one can improve the consistency of service and image names even further. However, this could also be done later. And another idea, maybe it would be good to split this file and change the deployment script in a way that difffernt files are used. I think it is still ok to navigate within this file, but as soon it get's longer than 1000 lines, splitting it might be a good idea.

docker-compose.yml Outdated

redis-jobrunner:
image: ghcr.io/mardi4nfdi/docker-redis-jobrunner
image: *redis_jobrunner_image
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it possible to use _ / - in the same way in the service name and image name.

docker-compose.yml Outdated

cassandra-oai:
hostname: cassandra-oai
image: cassandra:4.1
image: *cassandra_image
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe call the image cassandra_oai_image?

docker-compose.yml Outdated
@@ -115,7 +186,7 @@ services:

elasticsearch-oai-setup:
hostname: elasticsearch-oai-setup
image: centos
image: *centos_image
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use the service name here as well

docker-compose.yml Outdated
@@ -266,7 +334,7 @@ services:
- mongodb

importer:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe rename the service to mardi_importer

docker-compose.yml Outdated
@@ -293,7 +361,7 @@ services:
entrypoint: "/app/start.sh"

importer-api:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

docker-compose.yml Outdated
@@ -316,7 +384,7 @@ services:
- traefik.http.routers.importer-api.tls.certResolver=le

backup:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

docker-compose.yml Outdated
@@ -348,7 +416,7 @@ services:

reverse-proxy:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe rename service to traefik

docker-compose.yml Outdated
restart: always

setup_prometheus:
image: "ghcr.io/mardi4nfdi/docker-alpine-ext:main"
image: *mardi_docker_alpine
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename service or image?

@eloiferrer
Copy link
Member Author

I've split docker-compose.yml in two files, including now docker-compose-extra.yml.
docker-compose.yml contains now only the essential containers. There is not a clear line, but I've put all the APIs, analytics and so on in docker-compose-extra.yml. It should also be possible now to just run docker-compose.yml for development, to avoid running most of the extra stuff.

@physikerwelt
Copy link
Member

Very cool thank you.

@eloiferrer eloiferrer merged commit c31703d into main Jan 17, 2024
3 checks passed
@eloiferrer eloiferrer deleted the list_image_versions branch January 17, 2024 07:49
@eloiferrer eloiferrer mentioned this pull request Jan 17, 2024
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@physikerwelt physikerwelt Awaiting requested review from physikerwelt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@eloiferrer @physikerwelt