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

depenabot is not upgrading docker-compose files #5552

Closed
yurishkuro opened this issue Jun 10, 2024 · 10 comments · Fixed by #5554
Closed

depenabot is not upgrading docker-compose files #5552

yurishkuro opened this issue Jun 10, 2024 · 10 comments · Fixed by #5554
Labels
bug good first issue Good for beginners help wanted Features that maintainers are willing to accept but do not have cycles to implement

Comments

@yurishkuro
Copy link
Member

This comment: https://github.com/jaegertracing/jaeger/pull/5520/files#r1633476406
@yurishkuro yurishkuro added bug help wanted Features that maintainers are willing to accept but do not have cycles to implement good first issue Good for beginners labels Jun 10, 2024
@yurishkuro yurishkuro mentioned this issue Jun 10, 2024
Merged
4 tasks
@FlamingSaint
Copy link
Member

FlamingSaint commented Jun 10, 2024 •
edited
Loading

Just a small doubt. I don't think there is a configuration option in dependabot to do this:
https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

Maybe one solution is to create a sub-directory for each of those files and give the name as docker-compose.yml
Please correct me if I am wrong

@yurishkuro
Copy link
Member Author

if that's the case (seems like it) then we'd need to refactor your change to use standard file names and use directories for disambiguation, e.g. cassandra/v3/docker-compose.yaml

@yurishkuro
Copy link
Member Author

E.g. this is what we did for base images:

./docker/base/Dockerfile
./docker/debug/Dockerfile

@hellspawn679 hellspawn679 mentioned this issue Jun 10, 2024
Closed
4 tasks
@FlamingSaint FlamingSaint mentioned this issue Jun 10, 2024
Merged
4 tasks
yurishkuro added a commit that referenced this issue Jun 10, 2024
@FlamingSaint @yurishkuro
Create separate directories for docker compose files (#5554)
4f12ffe 
## Which problem is this PR solving?
- Resolves #5552 

## Description of the changes
- updated `dependabot.yml` and created sub-directories for
docker-compose files

## How was this change tested?
- 

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: FlamingSaint <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
@yurishkuro
Copy link
Member Author

yurishkuro commented Jun 11, 2024 •
edited
Loading

it's still not working

The property '#/updates/4/' contains additional properties ["update-types"] outside of the schema when none are allowed
The property '#/updates/5/' contains additional properties ["update-types"] outside of the schema when none are allowed
The property '#/updates/6/' contains additional properties ["update-types"] outside of the schema when none are allowed
The property '#/updates/7/' contains additional properties ["update-types"] outside of the schema when none are allowed

In the sample file I only see update-types used in some nested configs. I am trying another way #5560

@yurishkuro yurishkuro reopened this Jun 11, 2024
@yurishkuro yurishkuro mentioned this issue Jun 11, 2024
Merged
yurishkuro added a commit that referenced this issue Jun 11, 2024
@yurishkuro
Attempt another fix to dependabot config (#5560)
3d604ba 
## Which problem is this PR solving?
- #5552

## Description of the changes
- try different config

## How was this change tested?
- CI

Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro
Copy link
Member Author

yurishkuro commented Jun 11, 2024 •
edited
Loading

@FlamingSaint turns out docker-compose files are not supported by dependabot. The issue there has a workaround of using Dockerfiles in combination with docker-compose.

dependabot/dependabot-core#390 (comment)

Longer term, we should probably switch to Mend's Renovate bot (used by OTEL project), but should confirm if it supports docker-compose. Perhaps we can enable it just for docker-compose initially, to cover the gap of dependabot.

This was referenced Jun 11, 2024
Merged
Merged
@FlamingSaint
Copy link
Member

FlamingSaint commented Jun 11, 2024 •
edited
Loading

Oh I didn't check for that. My bad. Also looks like Renovate bot supports docker-compose. I could work on migrating from dependabot to renovate bot. Let me know if I should go ahead.

@FlamingSaint
Copy link
Member

Also now that the new bot can detect docker-compose files we can remove the unnecessary extra directories that are created.

@yurishkuro
Copy link
Member Author

@FlamingSaint can you stamp this? #5566

yurishkuro added a commit that referenced this issue Jun 11, 2024
@yurishkuro
[dependabot config] Remove invalid path (#5566)
4ec48d0 
## Which problem is this PR solving?
- The `/` path is invalid since there is no Dockerfile in the root dir.
Unfortunately, dependabot fails the whole run on this error, instead of
working through all the dirs
- Part of #5552

## Description of the changes
- Remove invalid path

## How was this change tested?
- Only testable after merge

Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro
Copy link
Member Author

@FlamingSaint fyi - I enabled Renovate bot, it seems to be correctly discovering all dependencies (#5572). But we need to do some preparations first (for one, it does not add the label we use for dependencies)

@yurishkuro
Copy link
Member Author

This is now working with Renovate bot, closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug good first issue Good for beginners help wanted Features that maintainers are willing to accept but do not have cycles to implement
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Create separate directories for docker compose files FlamingSaint/jaeger
2 participants
@yurishkuro @FlamingSaint