Skip to content

Commit c1a0363

Browse files
zkoppertCopilot
andcommitted
fix: address review feedback on Dockerfile compatibility
- Drop pip hash verification in Dockerfile (Trusty's pip ~1.5 predates --hash support added in pip 8.0); version pin alone addresses the code scanning finding - Pin bundler to 2.3.26 instead of 2.4.10 (Bundler 2.4.x requires Ruby >= 2.6.0, but the Dockerfile installs Ruby 2.4.1); update Gemfile.lock BUNDLED WITH to match - Fix CI comment to reference the actual Python 3 dependency (rest2html script) instead of the MARKUP_RST Ruby constant Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Zack Koppert <zkoppert@github.com>
1 parent aeab80d commit c1a0363

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3434
with:
35-
# This should match lib/github/markups.rb GitHub::Markups::MARKUP_RST
35+
# Required by lib/github/commands/rest2html (RST rendering)
3636
python-version: "3.x"
3737

3838
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ RUN install-zef-as-user && zef install Pod::To::HTML
1818
RUN curl -L http://cpanmin.us | perl - App::cpanminus
1919
RUN cpanm --installdeps --notest Pod::Simple
2020

21-
RUN echo 'docutils==0.18.1 --hash=sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c' > /tmp/requirements.txt && \
22-
pip install -r /tmp/requirements.txt
21+
RUN pip install docutils==0.18.1
2322

2423
ENV PATH $PATH:/root/.rbenv/bin:/root/.rbenv/shims
2524
RUN curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash
2625
RUN rbenv install 2.4.1
2726
RUN rbenv global 2.4.1
2827
RUN rbenv rehash
2928

30-
RUN gem install bundler -v 2.4.10
29+
RUN gem install bundler -v 2.3.26
3130

3231
WORKDIR /data/github-markup
3332
COPY github-markup.gemspec .

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,4 @@ DEPENDENCIES
138138
wikicloth (= 0.8.3)
139139

140140
BUNDLED WITH
141-
2.4.10
141+
2.3.26

0 commit comments

Comments
 (0)