Skip to content

Commit

Permalink
update versions
Browse files Browse the repository at this point in the history 
Signed-off-by: Jess Frazelle <[email protected]>
  • Loading branch information
@jessfraz
jessfraz committed Jul 26, 2019
1 parent 57a025c commit ecd6495
Show file tree
Hide file tree
Showing 27 changed files with 47 additions and 40 deletions.
2 changes: 1 addition & 1 deletion geary/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion gimp/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# --name gimp \
# jess/gimp
#
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion glxgears/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

# Base docker image
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

# Install all the things
Expand Down
2 changes: 1 addition & 1 deletion gparted/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#

# Base docker image
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

# Install Gparted and its dependencies
Expand Down
2 changes: 1 addition & 1 deletion iceweasel/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion lilyterm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

# Base docker image
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

# Install all the things
Expand Down
2 changes: 1 addition & 1 deletion lkp-tests/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

ENV DEBIAN_FRONTEND noninteractive
Expand Down
2 changes: 1 addition & 1 deletion lynx/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# --name lynx \
# jess/lynx github.com/jessfraz
#
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion mailman/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

# run
Expand Down
2 changes: 1 addition & 1 deletion mdp/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion mitmproxy/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

ENV LANG=en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion nerdy/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion nginx-extras/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion nmap/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion notify-osd/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# --name notify-osd \
# jess/notify-osd

FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion pandoc/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion pms/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# --link mpd:mpd \
# jess/pms
#
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion pond/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ WORKDIR /go/src/github.com/agl/pond
RUN go build -o /usr/bin/pond-client ./client \
&& go build -o /usr/bin/pond-server ./server

FROM debian:buster-slim
FROM debian:bullseye-slim

RUN apt-get update && apt-get install -y \
ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion rdesktop/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
35 changes: 21 additions & 14 deletions rstudio/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,27 @@
#

# Base docker image
FROM debian:jessie-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

# Install Rstudio deps
RUN apt-get update && apt-get install -y \
ca-certificates \
curl \
fcitx-frontend-qt5 \
fcitx-modules \
fcitx-module-dbus \
libasound2 \
libclang-dev \
libedit2 \
libgl1-mesa-dri \
libgl1-mesa-glx \
libgstreamer0.10-0 \
libgstreamer-plugins-base0.10-0 \
libgstreamer1.0-0 \
libgstreamer-plugins-base1.0-0 \
libjpeg-dev \
libjpeg62-turbo \
libjpeg62-turbo-dev \
libpresage1 \
libpresage1v5 \
libpresage-data \
libqt5core5a \
libqt5dbus5 \
Expand All @@ -36,9 +39,12 @@ RUN apt-get update && apt-get install -y \
libqt5printsupport5 \
libqt5webkit5 \
libqt5widgets5 \
libnss3 \
libtiff5 \
libxcomposite1 \
libxcursor1 \
libxslt1.1 \
libxtst6 \
littler \
locales \
r-base \
Expand All @@ -54,25 +60,18 @@ RUN apt-get update && apt-get install -y \
ENV RSTUDIO_VERSION 1.2.1335

# Download the source
RUN buildDeps=' \
ca-certificates \
curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& curl -sSL "https://download1.rstudio.org/desktop/trusty/amd64/rstudio-${RSTUDIO_VERSION}-amd64.deb" -o /tmp/rstudio-amd64.deb \
RUN curl -sSL "https://download1.rstudio.org/desktop/bionic/amd64/rstudio-${RSTUDIO_VERSION}-amd64.deb" -o /tmp/rstudio-amd64.deb \
&& dpkg -i /tmp/rstudio-amd64.deb \
&& rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps \
&& ln -f -s /usr/lib/rstudio/bin/rstudio /usr/bin/rstudio


ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8

# Set default CRAN repo
RUN echo 'options(repos = c(CRAN = "https://cran.rstudio.com/"), download.file.method = "libcurl")' >> /etc/R/Rprofile.site \
RUN mkdir -p /etc/R \
&& echo 'options(repos = c(CRAN = "https://cran.rstudio.com/"), download.file.method = "libcurl")' >> /etc/R/Rprofile.site \
&& echo 'source("/etc/R/Rprofile.site")' >> /etc/littler.r \
&& ln -s /usr/share/doc/littler/examples/install.r /usr/local/bin/install.r \
&& ln -s /usr/share/doc/littler/examples/install2.r /usr/local/bin/install2.r \
Expand All @@ -82,5 +81,13 @@ RUN echo 'options(repos = c(CRAN = "https://cran.rstudio.com/"), download.file.m
&& echo '"\e[5~": history-search-backward' >> /etc/inputrc \
&& echo '"\e[6~": history-search-backward' >> /etc/inputrc

ENV HOME /home/user
RUN useradd --create-home --home-dir $HOME user \
&& chown -R user:user $HOME

WORKDIR $HOME

USER user

# Autorun Rstudio
ENTRYPOINT [ "rstudio" ]
2 changes: 1 addition & 1 deletion rt-tests/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion shellcheck/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim

LABEL maintainer "Jessie Frazelle <[email protected]>"

Expand Down
2 changes: 1 addition & 1 deletion skype/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# --name skype \
# jess/skype
#
FROM debian:buster-slim
FROM debian:bullseye-slim

# Tell debconf to run in non-interactive mode
ENV DEBIAN_FRONTEND noninteractive
Expand Down
2 changes: 1 addition & 1 deletion slapd/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# Be aware that by default the LDAP port is accessible from anywhere if the \
# host firewall is unconfigured.
#
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && LC_ALL=C DEBIAN_FRONTEND=noninteractive \
Expand Down
2 changes: 1 addition & 1 deletion stress/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion sublime-text-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# (see: https://stackoverflow.com/questions/28392949/running-chromium-inside-docker-gtk-cannot-open-display-0)
#

FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Christian Koep <[email protected]>"

RUN apt-get update && apt-get -y install \
Expand Down
2 changes: 1 addition & 1 deletion traceroute/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apt-get update && apt-get install -y \
Expand Down

0 comments on commit ecd6495

Please sign in to comment.