From ecd6495c62cd64ca76b1c806c0491e2feb188fff Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 26 Jul 2019 10:55:34 -0700 Subject: [PATCH] update versions Signed-off-by: Jess Frazelle --- geary/Dockerfile | 2 +- gimp/Dockerfile | 2 +- glxgears/Dockerfile | 2 +- gparted/Dockerfile | 2 +- iceweasel/Dockerfile | 2 +- lilyterm/Dockerfile | 2 +- lkp-tests/Dockerfile | 2 +- lynx/Dockerfile | 2 +- mailman/Dockerfile | 2 +- mdp/Dockerfile | 2 +- mitmproxy/Dockerfile | 2 +- nerdy/Dockerfile | 2 +- nginx-extras/Dockerfile | 2 +- nmap/Dockerfile | 2 +- notify-osd/Dockerfile | 2 +- pandoc/Dockerfile | 2 +- pms/Dockerfile | 2 +- pond/Dockerfile | 2 +- rdesktop/Dockerfile | 2 +- rstudio/Dockerfile | 35 +++++++++++++++++++++-------------- rt-tests/Dockerfile | 2 +- shellcheck/Dockerfile | 2 +- skype/Dockerfile | 2 +- slapd/Dockerfile | 2 +- stress/Dockerfile | 2 +- sublime-text-3/Dockerfile | 2 +- traceroute/Dockerfile | 2 +- 27 files changed, 47 insertions(+), 40 deletions(-) diff --git a/geary/Dockerfile b/geary/Dockerfile index 76ecaa3..501abcd 100644 --- a/geary/Dockerfile +++ b/geary/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/gimp/Dockerfile b/gimp/Dockerfile index 6075d23..b2dc6d5 100644 --- a/gimp/Dockerfile +++ b/gimp/Dockerfile @@ -8,7 +8,7 @@ # --name gimp \ # jess/gimp # -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/glxgears/Dockerfile b/glxgears/Dockerfile index 02dff37..5629e34 100644 --- a/glxgears/Dockerfile +++ b/glxgears/Dockerfile @@ -6,7 +6,7 @@ # # Base docker image -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # Install all the things diff --git a/gparted/Dockerfile b/gparted/Dockerfile index 690ed5a..8d4ac0d 100644 --- a/gparted/Dockerfile +++ b/gparted/Dockerfile @@ -19,7 +19,7 @@ # # Base docker image -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # Install Gparted and its dependencies diff --git a/iceweasel/Dockerfile b/iceweasel/Dockerfile index cfa3e40..8039291 100644 --- a/iceweasel/Dockerfile +++ b/iceweasel/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/lilyterm/Dockerfile b/lilyterm/Dockerfile index 902dfcd..4501d95 100644 --- a/lilyterm/Dockerfile +++ b/lilyterm/Dockerfile @@ -5,7 +5,7 @@ # # Base docker image -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # Install all the things diff --git a/lkp-tests/Dockerfile b/lkp-tests/Dockerfile index 1c6f866..c91cccb 100644 --- a/lkp-tests/Dockerfile +++ b/lkp-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " ENV DEBIAN_FRONTEND noninteractive diff --git a/lynx/Dockerfile b/lynx/Dockerfile index 3c5c517..8fdd0c3 100644 --- a/lynx/Dockerfile +++ b/lynx/Dockerfile @@ -4,7 +4,7 @@ # --name lynx \ # jess/lynx github.com/jessfraz # -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/mailman/Dockerfile b/mailman/Dockerfile index 7f02202..a10b4a0 100644 --- a/mailman/Dockerfile +++ b/mailman/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # run diff --git a/mdp/Dockerfile b/mdp/Dockerfile index fa25c2b..556b805 100644 --- a/mdp/Dockerfile +++ b/mdp/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/mitmproxy/Dockerfile b/mitmproxy/Dockerfile index c2368a1..0aa99a7 100644 --- a/mitmproxy/Dockerfile +++ b/mitmproxy/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " ENV LANG=en_US.UTF-8 diff --git a/nerdy/Dockerfile b/nerdy/Dockerfile index a93d355..1bf39a8 100644 --- a/nerdy/Dockerfile +++ b/nerdy/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/nginx-extras/Dockerfile b/nginx-extras/Dockerfile index d60441a..9d60165 100644 --- a/nginx-extras/Dockerfile +++ b/nginx-extras/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/nmap/Dockerfile b/nmap/Dockerfile index b7c94be..8ec0f10 100644 --- a/nmap/Dockerfile +++ b/nmap/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/notify-osd/Dockerfile b/notify-osd/Dockerfile index 273d25b..441ffa8 100644 --- a/notify-osd/Dockerfile +++ b/notify-osd/Dockerfile @@ -17,7 +17,7 @@ # --name notify-osd \ # jess/notify-osd -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/pandoc/Dockerfile b/pandoc/Dockerfile index 543b7a0..fa381ef 100644 --- a/pandoc/Dockerfile +++ b/pandoc/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/pms/Dockerfile b/pms/Dockerfile index c0462b0..ff748b7 100644 --- a/pms/Dockerfile +++ b/pms/Dockerfile @@ -5,7 +5,7 @@ # --link mpd:mpd \ # jess/pms # -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/pond/Dockerfile b/pond/Dockerfile index c231d23..8ff4990 100644 --- a/pond/Dockerfile +++ b/pond/Dockerfile @@ -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 \ diff --git a/rdesktop/Dockerfile b/rdesktop/Dockerfile index 0c3c7b2..6cfa744 100644 --- a/rdesktop/Dockerfile +++ b/rdesktop/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile index d42c37a..e1ae064 100644 --- a/rstudio/Dockerfile +++ b/rstudio/Dockerfile @@ -10,24 +10,27 @@ # # Base docker image -FROM debian:jessie-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # 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 \ @@ -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 \ @@ -54,17 +60,9 @@ 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 @@ -72,7 +70,8 @@ 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 \ @@ -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" ] diff --git a/rt-tests/Dockerfile b/rt-tests/Dockerfile index 4d4f345..9b00a99 100644 --- a/rt-tests/Dockerfile +++ b/rt-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/shellcheck/Dockerfile b/shellcheck/Dockerfile index 2e66807..23ec48f 100644 --- a/shellcheck/Dockerfile +++ b/shellcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " diff --git a/skype/Dockerfile b/skype/Dockerfile index ca36d6f..e5b74b3 100644 --- a/skype/Dockerfile +++ b/skype/Dockerfile @@ -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 diff --git a/slapd/Dockerfile b/slapd/Dockerfile index a304023..f1a72c6 100644 --- a/slapd/Dockerfile +++ b/slapd/Dockerfile @@ -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 " RUN apt-get update && LC_ALL=C DEBIAN_FRONTEND=noninteractive \ diff --git a/stress/Dockerfile b/stress/Dockerfile index f6065ac..68cc20c 100644 --- a/stress/Dockerfile +++ b/stress/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/sublime-text-3/Dockerfile b/sublime-text-3/Dockerfile index 876bd11..4bbba7e 100644 --- a/sublime-text-3/Dockerfile +++ b/sublime-text-3/Dockerfile @@ -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 " RUN apt-get update && apt-get -y install \ diff --git a/traceroute/Dockerfile b/traceroute/Dockerfile index 0362c30..a53864a 100644 --- a/traceroute/Dockerfile +++ b/traceroute/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \