Skip to content

Commit

Permalink
Install git on containers
Browse files Browse the repository at this point in the history 
Closes r-hub/rhub#612
  • Loading branch information
@gaborcsardi
gaborcsardi committed May 30, 2024
1 parent bd5ba44 commit 0138fec
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 20 deletions.
2 changes: 1 addition & 1 deletion containers/atlas/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
# ------------------------------------------------------------------------------------
# Useful system packages

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

# ------------------------------------------------------------------------------------
# Check config
Expand Down
2 changes: 1 addition & 1 deletion containers/c23/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ COPY r-check /usr/local/bin

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

RUN curl -o /usr/local/bin/checkbashisms \
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 qpdf tidy && \
apt-get install -y pkg-config perl qpdf git 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 @@ -72,7 +72,7 @@ COPY r-check /usr/local/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y pkg-config perl qpdf tidy && \
apt-get install -y pkg-config perl qpdf git 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 @@ -72,7 +72,7 @@ COPY r-check /usr/local/bin

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

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

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

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

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

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
2 changes: 1 addition & 1 deletion containers/donttest/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,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 tidy qpdf curl && \
apt-get install -y pkg-config perl tidy qpdf git curl && \
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 @@ -64,7 +64,7 @@ COPY r-check /usr/local/bin
# ------------------------------------------------------------------------------------
# Useful system packages

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

# ------------------------------------------------------------------------------------
# CRAN's config from https://www.stats.ox.ac.uk/pub/bdr/gcc13/README.txt
Expand Down
2 changes: 1 addition & 1 deletion containers/gcc14/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
# ------------------------------------------------------------------------------------
# Useful system packages

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

# ------------------------------------------------------------------------------------
# CRAN's config from https://www.stats.ox.ac.uk/pub/bdr/gcc14/README.txt
Expand Down
2 changes: 1 addition & 1 deletion containers/intel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ COPY r-check /usr/local/bin
# ------------------------------------------------------------------------------------
# Useful system packages

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

# ------------------------------------------------------------------------------------
# Check config
Expand Down
2 changes: 1 addition & 1 deletion containers/mkl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ COPY r-check /usr/local/bin
# ------------------------------------------------------------------------------------
# Useful system packages

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

# ------------------------------------------------------------------------------------
# Copy MKL environment
Expand Down
2 changes: 1 addition & 1 deletion containers/nold/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,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 tidy qpdf && \
apt-get install -y pkg-config perl tidy qpdf git && \
apt-get clean

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

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

RUN curl -o /usr/local/bin/checkbashisms \
Expand Down
2 changes: 1 addition & 1 deletion containers/nosuggests/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN /opt/R/devel-gcc/bin/R -q -e 'dir.create(Sys.getenv("R_LIBS_USER"), showWarn
# ------------------------------------------------------------------------------------
# Useful system packages

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

# ------------------------------------------------------------------------------------
# TinyTeX, only available for x86_64
Expand Down
8 changes: 8 additions & 0 deletions containers/rchk/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ENV LC_COLLATE C
ENV LANG en_GB.UTF-8

# ------------------------------------------------------------------------------------
# System packages

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

# ------------------------------------------------------------------------------------
# Use user's package library for the rest

Expand Down
2 changes: 1 addition & 1 deletion containers/ubuntu-clang/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ COPY r-check /usr/local/bin

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

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

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

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

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

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

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

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

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

# ------------------------------------------------------------------------------------
# valgrind config
Expand Down

0 comments on commit 0138fec

Please sign in to comment.