Un-deprecate Some Public Example Images

deprecated/golang/Dockerfile.ubuntu → images/golang/Dockerfile.ubuntu

@@ -14,8 +14,5 @@ ENV GOPATH /home/coder/go
 ENV GOBIN $GOPATH/bin
 ENV PATH $PATH:$GOBIN
 
-COPY deprecated.txt /etc/motd
-RUN echo '[ ! -z "$TERM" ] && cat /etc/motd' >> /etc/bash.bashrc
-
 # Set back to coder user
 USER coder

deprecated/golang/README.md → images/golang/README.md

@@ -1,4 +1,4 @@
-# Enterprise Golang
+# Example Golang
 
 [![DockerPulls](https://img.shields.io/docker/pulls/codercom/enterprise-golang)](https://hub.docker.com/r/codercom/enterprise-golang)
 
@@ -7,7 +7,7 @@
 Wraps [enterprise-base](../base/README.md) with the basics for Go development.
 
 > **Note:** This image does not contain GoLand. For an example of how to install
-> GoLand, see [enterprise-goland](../goland/README.md)
+> GoLand, see [enterprise-goland](../../deprecated/goland/README.md)
 
 ## How To Use
 

deprecated/java/Dockerfile.ubuntu → images/java/Dockerfile.ubuntu

@@ -52,8 +52,5 @@ RUN mkdir -p /usr/share/gradle /usr/share/gradle/ref \
 
 ENV PATH $PATH:$GRADLE_HOME/bin
 
-COPY deprecated.txt /etc/motd
-RUN echo '[ ! -z "$TERM" ] && cat /etc/motd' >> /etc/bash.bashrc
-
 # Set back to coder user
 USER coder

deprecated/java/README.md → images/java/README.md

@@ -1,4 +1,4 @@
-# Enterprise Java
+# Example Java
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/codercom/enterprise-java?label=codercom%2Fenterprise-java)](https://hub.docker.com/r/codercom/enterprise-java)
 
@@ -7,7 +7,7 @@
 Wraps [enterprise-base](../base/README.md) with the basics for Java development.
 
 > **Note:** This image does not contain IntelliJ. For an example of how to
-> install IntelliJ, see [enterprise-intellij](../intellij/README.md)
+> install IntelliJ, see [enterprise-intellij](../../deprecated/intellij/README.md)
 
 ## How To Use
 

deprecated/node/Dockerfile.ubuntu → images/node/Dockerfile.ubuntu

@@ -13,8 +13,5 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get install -y yarn
 
-COPY deprecated.txt /etc/motd
-RUN echo '[ ! -z "$TERM" ] && cat /etc/motd' >> /etc/bash.bashrc
-
 # Set back to coder user
 USER coder

deprecated/node/README.md → images/node/README.md

@@ -1,4 +1,4 @@
-# Enterprise Node
+# Example Node
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/codercom/enterprise-node?label=codercom%2Fenterprise-node)](https://hub.docker.com/r/codercom/enterprise-node)
 

images/rstudio-server/Dockerfile.ubuntu

@@ -0,0 +1,71 @@
+FROM codercom/enterprise-base:ubuntu
+
+USER root
+
+RUN apt update -y
+
+# R-Base
+RUN <<EOF
+apt install --no-install-recommends gdebi-core nginx software-properties-common dirmngr net-tools -y
+add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/"
+apt install --no-install-recommends r-base -y
+EOF
+
+ARG ARCH=amd64
+ARG BUILD=rstudio-server-2024.04.2-764-${ARCH}.deb
+
+# RStudio Server
+RUN <<EOF
+curl -fsSL -o /tmp/${BUILD} https://s3.amazonaws.com/rstudio-ide-build/server/jammy/${ARCH}/${BUILD}
+echo "y" | gdebi /tmp/${BUILD} -
+EOF
+
+# Make directory for rstudio data in home dir
+RUN mkdir /home/coder/.rstudio && \
+    chown -R coder:coder /home/coder/.rstudio
+
+# Allow ownership of mandatory folders/files
+RUN chown -R coder:coder \
+    /home/coder/.rstudio \
+    /var/run/rstudio-server.pid \
+    /var/lib/rstudio-server \
+    /var/run/rstudio-server \
+    /etc/rstudio
+
+# RStudio Server Config
+COPY --chown=coder:coder <<EOF /etc/rstudio/rserver.conf
+server-user=coder
+server-daemonize=1
+server-data-dir=/home/coder/.rstudio/data
+server-pid-file=/tmp/rstudio-server.pid
+auth-none=1
+www-frame-origin=same
+www-address=127.0.0.1
+www-port=8787
+database-config-file=/etc/rstudio/database.conf
+EOF
+
+# RStudio Database
+COPY --chown=coder:coder <<EOF /etc/rstudio/database.conf
+provider=sqlite
+directory=/home/coder/.rstudio
+EOF
+
+# RStudio DB Launcher
+# Launcher config -- Use TLS
+# If your coder deployment is NOT on tls, you will want to remove this line.
+COPY --chown=coder:coder <<EOF /etc/rstudio/database.conf
+enable-ssl=0
+EOF
+
+# Extras
+RUN <<EOF
+locale-gen en_US.UTF-8
+apt install zsh fish -y
+EOF
+
+# Set back to coder user
+USER coder
+
+# Add RStudio to path
+ENV PATH=/usr/lib/rstudio-server/bin:${PATH}

images/rstudio-server/README.md

@@ -0,0 +1,7 @@
+# Example RStudio Server
+
+[![Docker Pulls](https://img.shields.io/docker/pulls/codercom/rstudio-server?label=codercom%2Frstudio-server)](https://hub.docker.com/r/codercom/rstudio-server)
+
+## Description
+
+Wraps [enterprise-base](../base/README.md) and installs RStudio Server.