Skip to content

Replace docker-compose with docker compose#2153

Merged
bobcallaway merged 1 commit intosigstore:mainfrom
cmurphy:fix-docker-compose
Jun 19, 2024
Merged

Replace docker-compose with docker compose#2153
bobcallaway merged 1 commit intosigstore:mainfrom
cmurphy:fix-docker-compose

Conversation

@cmurphy
Copy link
Copy Markdown
Contributor

@cmurphy cmurphy commented Jun 18, 2024

Fixes CI error "ERROR: for rekor_rekor-server_1 'ContainerConfig'".

See https://forums.docker.com/t/docker-compose-up-fails-after-yesterday-update-possible-regression-in-2-25-0-1/140430/9

Summary

Release Note

Documentation

@cmurphy cmurphy requested a review from a team as a code owner June 18, 2024 18:23
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 50.28%. Comparing base (488eb97) to head (299cae3).
Report is 137 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff             @@
##             main    #2153       +/-   ##
===========================================
- Coverage   66.46%   50.28%   -16.18%     
===========================================
  Files          92       92               
  Lines        9258     7308     -1950     
===========================================
- Hits         6153     3675     -2478     
- Misses       2359     2760      +401     
- Partials      746      873      +127     
Flag Coverage Δ
e2etests 50.28% <ø> (+2.72%) ⬆️
unittests ?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bobcallaway
Copy link
Copy Markdown
Member

I used a conditional for environments who haven't updated to the latest version of docker in

docker_compose="docker compose -f docker-compose.yml -f docker-compose.test.yml"
- you might want to do something similar here

Fixes CI error "ERROR: for rekor_rekor-server_1  'ContainerConfig'".

Signed-off-by: Colleen Murphy <colleenmurphy@google.com>
@cmurphy cmurphy force-pushed the fix-docker-compose branch from 716d0e0 to 299cae3 Compare June 18, 2024 21:00
@cmurphy
Copy link
Copy Markdown
Contributor Author

cmurphy commented Jun 18, 2024

@bobcallaway done

@cpanato cpanato requested a review from bobcallaway June 19, 2024 06:36
@bobcallaway bobcallaway merged commit abcdf4b into sigstore:main Jun 19, 2024
@github-actions github-actions Bot added this to the v1.2.2 milestone Jun 19, 2024
fghanmi pushed a commit to securesign/rekor that referenced this pull request Aug 5, 2024
Fixes CI error "ERROR: for rekor_rekor-server_1  'ContainerConfig'".

Signed-off-by: Colleen Murphy <colleenmurphy@google.com>
fghanmi pushed a commit to securesign/rekor that referenced this pull request Aug 13, 2024
Fixes CI error "ERROR: for rekor_rekor-server_1  'ContainerConfig'".

Signed-off-by: Colleen Murphy <colleenmurphy@google.com>
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