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.

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

Bump components' versions in docker-compose.yaml #5152

Merged
merged 3 commits into from
Dec 9, 2024

Conversation

prezha
Copy link
Contributor

@prezha prezha commented Dec 5, 2024

Summary

Bump components for local development environment to current version in docker-compose.yaml:

note re:keycloak: comment #5152 (review) below

Bonus: remove redundant entry in .gitignore.

Change Type

Mark the type of change your PR introduces:

  • Bug fix (resolves an issue without affecting existing features)
  • Feature (adds new functionality without breaking changes)
  • Breaking change (may impact existing functionalities or require documentation updates)
  • Documentation (updates or additions to documentation)
  • Refactoring or test improvements (no bug fixes or new functionality)

Testing

Successfully tested locally:

$ make run-docker
Running docker compose down ...
Running docker compose up ...
Building the minder-server image (KO_DOCKER_REPO=ko.local)...
2024/12/05 20:17:57 Using base cgr.dev/chainguard/static:latest@sha256:5ff428f8a48241b93a4174dbbc135a4ffb2381a9e10bdbbc5b9db145645886d5 for github.com/mindersec/minder/cmd/server
2024/12/05 20:17:58 git is in a dirty state
Please check in your pipeline what can be changing the following files:
 M .gitignore
 M docker-compose.yaml
 M docker/minder/Dockerfile
 M docker/reminder/Dockerfile
 M docs/docs/run_minder_server/run_the_server.md
 M go.mod
 M internal/verifier/sigstore/tufroots/tuf-repo.github.com/root.json
 M tools/go.mod

2024/12/05 20:17:58 Building github.com/mindersec/minder/cmd/server for linux/amd64
2024/12/05 20:18:02 Loading ko.local/server:f0d7d43f7c91f9e857e85109c54a9385456d6c5b43375302755741f33682879d
2024/12/05 20:18:02 Loaded ko.local/server:f0d7d43f7c91f9e857e85109c54a9385456d6c5b43375302755741f33682879d
2024/12/05 20:18:02 Adding tag latest
2024/12/05 20:18:02 Added tag latest
[+] Running 8/8
 ✔ Network minder_app_net        Created                                                                                                                                                                                                                                                                                                                                                                                                                                             0.1s 
 ✔ Container keycloak_container  Healthy                                                                                                                                                                                                                                                                                                                                                                                                                                            32.3s 
 ✔ Container openfga             Healthy                                                                                                                                                                                                                                                                                                                                                                                                                                            32.3s 
 ✔ Container nats                Healthy                                                                                                                                                                                                                                                                                                                                                                                                                                            32.3s 
 ✔ Container postgres_container  Healthy                                                                                                                                                                                                                                                                                                                                                                                                                                            32.3s 
 ✔ Container minder_migrate_up   Exited                                                                                                                                                                                                                                                                                                                                                                                                                                             34.2s 
 ✔ Container keycloak_config     Exited                                                                                                                                                                                                                                                                                                                                                                                                                                             32.1s 
 ✔ Container minder_server       Started                                                                                                                                                                                                                                                                                                                                                                                                                                            34.4s 
$ docker ps --all
CONTAINER ID   IMAGE                                                                              COMMAND                  CREATED          STATUS                      PORTS                                                                                                                             NAMES
19047a7003b8   ko.local/server:f0d7d43f7c91f9e857e85109c54a9385456d6c5b43375302755741f33682879d   "/ko-app/server serv…"   44 seconds ago   Up 9 seconds                0.0.0.0:8080->8080/tcp, :::8080->8080/tcp, 0.0.0.0:8090->8090/tcp, :::8090->8090/tcp, 0.0.0.0:9090->9090/tcp, :::9090->9090/tcp   minder_server
bf0ca19b82f4   bitnami/keycloak-config-cli:6.2.1                                                  "java -jar /opt/bitn…"   44 seconds ago   Exited (0) 15 seconds ago                                                                                                                                     keycloak_config
abfd0b47a593   ko.local/server:f0d7d43f7c91f9e857e85109c54a9385456d6c5b43375302755741f33682879d   "/ko-app/server migr…"   44 seconds ago   Exited (0) 10 seconds ago                                                                                                                                     minder_migrate_up
13e762deaea3   postgres:17.2-alpine                                                               "docker-entrypoint.s…"   44 seconds ago   Up 43 seconds (healthy)     0.0.0.0:5432->5432/tcp, :::5432->5432/tcp                                                                                         postgres_container
b061de0ad640   quay.io/keycloak/keycloak:26.0.7                                                   "/opt/keycloak/bin/k…"   44 seconds ago   Up 43 seconds (healthy)     8443/tcp, 9000/tcp, 0.0.0.0:8081->8080/tcp, :::8081->8080/tcp                                                                     keycloak_container
06ac41bfe625   openfga/openfga:v1.8.0                                                             "/openfga run --play…"   44 seconds ago   Up 43 seconds (healthy)     0.0.0.0:8085->8085/tcp, :::8085->8085/tcp, 0.0.0.0:8082->8080/tcp, :::8082->8080/tcp, 0.0.0.0:8083->8081/tcp, :::8083->8081/tcp   openfga
590e29d5dc70   nats:2.10.22                                                                       "./nats-server --htt…"   44 seconds ago   Up 43 seconds (healthy)     0.0.0.0:4222->4222/tcp, :::4222->4222/tcp, 0.0.0.0:8222->8222/tcp, :::8222->8222/tcp, 6222/tcp                                    nats

Review Checklist:

  • Reviewed my own code for quality and clarity.
  • Added comments to complex or tricky code sections.
  • Updated any affected documentation.
  • Included tests that validate the fix or feature.
  • Checked that related changes are merged.

@prezha prezha requested a review from a team as a code owner December 5, 2024 22:30
@coveralls
Copy link

coveralls commented Dec 5, 2024

Coverage Status

coverage: 55.184% (-0.03%) from 55.215%
when pulling b342e04 on prezha:docker-compose
into b4fc9e3 on mindersec:main.

Copy link
Contributor

@eleftherias eleftherias left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @prezha!
There are some dependencies we're not ready to upgrade yet, but the rest looks good.

@@ -125,7 +125,7 @@ services:

keycloak:
container_name: keycloak_container
image: quay.io/keycloak/keycloak:25.0
Copy link
Contributor

Choose a reason for hiding this comment

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

We're not ready to upgrade Keycloak to v26 yet. We've been waiting for a compatible version of https://github.com/adorsys/keycloak-config-cli, which just came out. We'll be doing a careful upgrade in the coming days / weeks to ensure all the edge cases still work, since it is a major version update.

@@ -145,7 +145,7 @@ services:

keycloak-config:
container_name: keycloak_config
image: bitnami/keycloak-config-cli:6.1.6
Copy link
Contributor

Choose a reason for hiding this comment

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

Similar to the comment above, we're going to plan this update later along with some thorough testing.

.gitignore Show resolved Hide resolved
@prezha
Copy link
Contributor Author

prezha commented Dec 6, 2024

thanks for the review and providing some more context, @eleftherias !

based on that, i've reverted the change in keycloak-related dependencies and also bumped a notch up openfga - to be in line with the pr #5156

@prezha
Copy link
Contributor Author

prezha commented Dec 6, 2024

this is interesting:

📦 github.com/mindersec/minder/internal/providers/github/webhook
    testing.go:1399: race detected during execution of test

@eleftherias eleftherias merged commit 5160fae into mindersec:main Dec 9, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants