Skip to content

Commit

Permalink
Merge branch 'rocker-org:master' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
@almahmoud
almahmoud authored Dec 4, 2024
2 parents ab2803f + 8d2945d commit a96c16a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 24 deletions.
17 changes: 9 additions & 8 deletions focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ LABEL org.label-schema.license="GPL-2.0" \
RUN useradd -s /bin/bash -m docker \
&& usermod -a -G staff docker \
## Refresh apt, install minimal tools
&& apt-get update \
&& apt-get install -y --no-install-recommends \
&& apt update \
&& apt upgrade -y \
&& apt install -y --no-install-recommends \
ca-certificates \
locales \
wget \
Expand All @@ -38,15 +39,15 @@ RUN useradd -s /bin/bash -m docker \
&& /usr/sbin/update-locale LANG=en_US.UTF-8

## Set some variables
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV DEBIAN_FRONTEND noninteractive
ENV TZ UTC
ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=UTC

## Now install R and littler, and create a link for littler in /usr/local/bin
## Default CRAN repo is now set by R itself, and littler knows about it too
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
RUN apt update \
&& apt install -y --no-install-recommends \
r-base \
r-base-dev \
r-recommended \
Expand Down
17 changes: 9 additions & 8 deletions jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ LABEL org.label-schema.license="GPL-2.0" \
RUN useradd -s /bin/bash -m docker \
&& usermod -a -G staff docker \
## Refresh apt, install minimal tools
&& apt-get update \
&& apt-get install -y --no-install-recommends \
&& apt update \
&& apt upgrade -y \
&& apt install -y --no-install-recommends \
ca-certificates \
locales \
wget \
Expand All @@ -38,16 +39,16 @@ RUN useradd -s /bin/bash -m docker \
&& /usr/sbin/update-locale LANG=en_US.UTF-8

## Set some variables
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV DEBIAN_FRONTEND noninteractive
ENV TZ UTC
ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=UTC


# Now install R and littler, and create a link for littler in /usr/local/bin
# Default CRAN repo is now set by R itself, and littler knows about it too
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
RUN apt update \
&& apt install -y --no-install-recommends \
r-base \
r-base-dev \
r-recommended \
Expand Down
17 changes: 9 additions & 8 deletions noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ LABEL org.label-schema.license="GPL-2.0" \
RUN useradd -s /bin/bash -m docker \
&& usermod -a -G staff docker \
## Refresh apt, install minimal tools
&& apt-get update \
&& apt-get install -y --no-install-recommends \
&& apt update \
&& apt upgrade -y \
&& apt install -y --no-install-recommends \
ca-certificates \
locales \
wget \
Expand All @@ -38,16 +39,16 @@ RUN useradd -s /bin/bash -m docker \
&& /usr/sbin/update-locale LANG=en_US.UTF-8

## Set some variables
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV DEBIAN_FRONTEND noninteractive
ENV TZ UTC
ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=UTC


# Now install R and littler, and create a link for littler in /usr/local/bin
# Default CRAN repo is now set by R itself, and littler knows about it too
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
RUN apt update \
&& apt install -y --no-install-recommends \
r-base \
r-base-dev \
r-recommended \
Expand Down

0 comments on commit a96c16a

Please sign in to comment.