Skip to content

fix: convert line endings of Dockerfile to linux - #952

Merged
aelsabbahy merged 6 commits into
goss-org:masterfrom
dklimpel:fix_dockerfile
Aug 29, 2024
Merged

aelsabbahy merged 6 commits into
goss-org:masterfrom
dklimpel:fix_dockerfile

Conversation

@dklimpel

@dklimpel dklimpel commented Jul 13, 2024 •

Copy link
Copy Markdown
Contributor
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
Copy Markdown
Member

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

@dklimpel

Copy link
Copy Markdown
Contributor Author

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

Done

@aelsabbahy

Copy link
Copy Markdown
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

dklimpel commented Aug 4, 2024 •

Copy link
Copy Markdown
Contributor Author

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
@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

⌂ 换网址