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

fix: convert line endings of Dockerfile to linux #952

Merged
merged 6 commits into from
Aug 29, 2024

Conversation

dklimpel
Copy link
Contributor

@dklimpel dklimpel commented Jul 13, 2024

Checklist
  • make test-all (UNIX) passes. CI will also test this
  • unit and/or integration tests are included (if applicable)
  • documentation is changed or added (if applicable)

Description of change

convert from windows to linux line endings

how to find

find . -not -type d -exec file "{}" ";" | grep CRLF

@aelsabbahy
Copy link
Member

This has a merge conflict. Once resolved, I'll merge it.

@dklimpel
Copy link
Contributor Author

This has a merge conflict. Once resolved, I'll merge it.

Done

@aelsabbahy
Copy link
Member

Package: httpd: version:
Expected
    ["2.4.57-11.el9_4"]
to contain elements matching
    ["2.4.57-8.el9"]
the missing elements were
    ["2.4.57-8.el9"]

I'm guessing the image checksum logic isn't working and the images are getting rebuilt, so package versions are drifting on the tests.

@dklimpel
Copy link
Contributor Author

dklimpel commented Aug 4, 2024

The update of httpd is part of #961

The image checksum logic would work. But this need to upload the image to https://hub.docker.com/u/aelsabbahy and create a checksum file.

The alternative with the ghcr is part of #901

@aelsabbahy aelsabbahy merged commit 9d9b95f into goss-org:master Aug 29, 2024
7 checks passed
@dklimpel dklimpel deleted the fix_dockerfile branch August 29, 2024 19:41
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.

2 participants