Update Dockerfiles to allow building with Asciidoctor #47
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We're going to start building Asciidoctor as a gem in the future, and it won't work on the ancient version of Ruby in CentOS 7. Use the Software Collections repository to get Ruby 3.0 and then invoke our script with it in the path.
We'd like to use AsciiDoc to build our documentation in the future, so let's install Asciidoctor to do that for us.
chrisd8088
approved these changes
Jun 23, 2022
chrisd8088
added a commit
to chrisd8088/build-dockers
that referenced
this pull request
Dec 27, 2022
In commit 833d085 of PR git-lfs#47 we updated our Debian Dockerfiles so they would install the asciidoctor package, to allow our primary Git LFS project to migrate from ronn to asciidoctor. Now that that migration is complete, as of PR git-lfs/git-lfs#5054, we can update our Debian Dockerfiles again so they no longer install any ronn packages.
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 27, 2022
In commit git-lfs/build-dockers@544e07e of PR git-lfs/build-dockers#47 we updated our CentOS 7 Dockerfile to install Ruby 3.0 using the rh-ruby30-{ruby,build} packages and then run our CentOS build script with that version of Ruby as the default. We made this change to support our use of Asciidoctor in preference to ronn, which was completed in PR git-lfs#5054, and as part of that PR, in commit db9a821 we replaced our installation of ronn with one of asciidoctor in our rpm/build_rpms.bsh script. As a result, none of our CentOS or Rocky Linux container image builds now rely on Ruby 2.x, so we can remove the code which installed that version. We can also remove the related code which used to install Ruby 2.x when an even older version was the default, along with our local ruby.spec file for Ruby 2.2.2. Finally, we can remove the code which installed the rubygems-devel package on CentOS 8 because that is taken care of by the corresponding Dockerfile in our git-lfs/build-dockers project, which, like the one for Rocky Linux 9, installs ruby, ruby-devel, and rubygems-devel.
chrisd8088
added a commit
to chrisd8088/build-dockers
that referenced
this pull request
Dec 27, 2022
In commit 833d085 of PR git-lfs#47 we updated our Debian Dockerfiles so they would install the asciidoctor package, to allow our primary Git LFS project to migrate from ronn to asciidoctor. Now that that migration is complete, as of PR git-lfs/git-lfs#5054, we can update our Debian Dockerfiles again so they no longer install any ronn packages.
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 27, 2022
In commit git-lfs/build-dockers@544e07e of PR git-lfs/build-dockers#47 we updated our CentOS 7 Dockerfile to install Ruby 3.0 using the rh-ruby30-{ruby,build} packages and then run our CentOS build script with that version of Ruby as the default. We made this change to support our use of Asciidoctor in preference to ronn, which was completed in PR git-lfs#5054, and as part of that PR, in commit db9a821 we replaced our installation of ronn with one of asciidoctor in our rpm/build_rpms.bsh script. As a result, none of our CentOS or Rocky Linux container image builds now rely on Ruby 2.x, so we can remove the code which installed that version. We can also remove the related code which used to install Ruby 2.x when an even older version was the default, along with our local ruby.spec file for Ruby 2.2.2. Finally, we can remove the code which installed the rubygems-devel package on CentOS 8 because that is taken care of by the corresponding Dockerfile in our git-lfs/build-dockers project, which, like the one for Rocky Linux 9, installs ruby, ruby-devel, and rubygems-devel.
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 28, 2022
In commit git-lfs/build-dockers@544e07e of PR git-lfs/build-dockers#47 we updated our CentOS 7 Dockerfile to install Ruby 3.0 using the rh-ruby30-{ruby,build} packages and then run our CentOS build script with that version of Ruby as the default. We made this change to support our use of Asciidoctor in preference to ronn, which was completed in PR git-lfs#5054, and as part of that PR, in commit db9a821 we replaced our installation of ronn with one of asciidoctor in our rpm/build_rpms.bsh script. As a result, none of our CentOS or Rocky Linux container image builds now rely on Ruby 2.x, so we can remove the code which installed that version. We can also remove the related code which used to install Ruby 2.x when an even older version was the default, along with our local ruby.spec file for Ruby 2.2.2. Finally, we can remove the code which installed the rubygems-devel package on CentOS 8 because that is taken care of by the corresponding Dockerfile in our git-lfs/build-dockers project, which, like the one for Rocky Linux 9, installs ruby, ruby-devel, and rubygems-devel.
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 28, 2022
In commit git-lfs/build-dockers@544e07e of PR git-lfs/build-dockers#47 we updated our CentOS 7 Dockerfile to install Ruby 3.0 using the rh-ruby30-{ruby,build} packages and then run our CentOS build script with that version of Ruby as the default. We made this change to support our use of Asciidoctor in preference to ronn, which was completed in PR git-lfs#5054, and as part of that PR, in commit db9a821 we replaced our installation of ronn with one of asciidoctor in our rpm/build_rpms.bsh script. As a result, none of our CentOS or Rocky Linux container image builds now rely on Ruby 2.x, so we can remove the code which installed that version. We can also remove the related code which used to install Ruby 2.x when an even older version was the default, along with our local ruby.spec file for Ruby 2.2.2. Finally, we can remove the code which installed the rubygems-devel package on CentOS 8 because that is taken care of by the corresponding Dockerfile in our git-lfs/build-dockers project, which, like the one for Rocky Linux 9, installs ruby, ruby-devel, and rubygems-devel.
chrisd8088
added a commit
to chrisd8088/build-dockers
that referenced
this pull request
Dec 28, 2022
In commit 833d085 of PR git-lfs#47 we updated our Debian Dockerfiles so they would install the asciidoctor package, to allow our primary Git LFS project to migrate from ronn to asciidoctor. Now that that migration is complete, as of PR git-lfs/git-lfs#5054, we can update our Debian Dockerfiles again so they no longer install any ronn packages.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the Dockerfiles to allow building with Asciidoctor. Note that we don't remove the use of ronn in the Debian Dockerfiles to prevent CI from failing before the git-lfs/git-lfs changes are merged.