Skip to content

Commit

Permalink
Make sure we install qpdf and tidy
Browse files Browse the repository at this point in the history 
Really closes #36.
  • Loading branch information
@gaborcsardi
gaborcsardi committed Jun 29, 2023
1 parent 299ccc1 commit 34df868
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 43 deletions.
2 changes: 1 addition & 1 deletion containers/atlas/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ COPY r-check /usr/local/bin
# ------------------------------------------------------------------------------------
# Useful system packages

RUN dnf install -y pkg-config devscripts-checkbashisms
RUN dnf install -y pkg-config devscripts-checkbashisms qpdf tidy

# ------------------------------------------------------------------------------------
# Check config
Expand Down
2 changes: 1 addition & 1 deletion containers/clang-asan/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl qpdf tidy && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
2 changes: 1 addition & 1 deletion containers/clang16/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl qpdf tidy && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
2 changes: 1 addition & 1 deletion containers/clang17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl qpdf tidy && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
2 changes: 1 addition & 1 deletion containers/gcc13/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ COPY r-check /usr/local/bin
# ------------------------------------------------------------------------------------
# Useful system packages

RUN dnf -y install pkg-config devscripts-checkbashisms
RUN dnf -y install pkg-config devscripts-checkbashisms qpdf tidy

# ------------------------------------------------------------------------------------
# CRAN's config from https://www.stats.ox.ac.uk/pub/bdr/gcc13/README.txt
Expand Down
3 changes: 1 addition & 2 deletions containers/nold/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl tidy qpdf && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand All @@ -76,4 +76,3 @@ RUN curl -o /usr/local/bin/checkbashisms \
# Check config

ENV CHECK_ARGS="--no-manual --no-build-vignettes"
ENV _R_CHECK_BASHISMS_=false
10 changes: 1 addition & 9 deletions containers/ubuntu-clang/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
rm r-*.deb && \
apt-get clean

# ------------------------------------------------------------------------------------
# Tools needed for the check

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y devscripts tidy && \
apt-get clean

# ------------------------------------------------------------------------------------
# clang 15, gfortran 12
RUN export DEBIAN_FRONTEND=noninteractive && \
Expand Down Expand Up @@ -92,7 +84,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl tidy qpdf && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
10 changes: 1 addition & 9 deletions containers/ubuntu-gcc12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
rm r-*.deb && \
apt-get clean

# ------------------------------------------------------------------------------------
# Tools needed for the check

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y devscripts tidy && \
apt-get clean

# ------------------------------------------------------------------------------------
# gcc 12, gfortran 12
RUN export DEBIAN_FRONTEND=noninteractive && \
Expand Down Expand Up @@ -92,7 +84,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl tidy qpdf && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
10 changes: 1 addition & 9 deletions containers/ubuntu-next/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
rm r-*.deb && \
apt-get clean

# ------------------------------------------------------------------------------------
# Tools needed for the check

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y devscripts tidy && \
apt-get clean

# ------------------------------------------------------------------------------------
# TinyTeX

Expand Down Expand Up @@ -74,7 +66,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl tidy qpdf && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
10 changes: 1 addition & 9 deletions containers/ubuntu-release/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /opt/R/* /opt/R/release && \
apt-get clean

# ------------------------------------------------------------------------------------
# Tools needed for the check

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y devscripts tidy && \
apt-get clean

# ------------------------------------------------------------------------------------
# TinyTeX

Expand Down Expand Up @@ -76,7 +68,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl && \
apt-get install -y pkg-config perl tidy qpdf && \
apt-get clean

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down

0 comments on commit 34df868

Please sign in to comment.