From 32cf04b5fa0e0a66c109525830057a4bbad49769 Mon Sep 17 00:00:00 2001 From: Jullian Pepito Date: Thu, 3 Oct 2024 10:49:50 -0700 Subject: [PATCH 1/8] refactor(images/golang): undeprecated enterprise-golang --- deprecated/golang/deprecated.txt | 7 ------- {deprecated => images}/golang/Dockerfile.ubuntu | 0 {deprecated => images}/golang/README.md | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 deprecated/golang/deprecated.txt rename {deprecated => images}/golang/Dockerfile.ubuntu (100%) rename {deprecated => images}/golang/README.md (81%) diff --git a/deprecated/golang/deprecated.txt b/deprecated/golang/deprecated.txt deleted file mode 100644 index 60285084..00000000 --- a/deprecated/golang/deprecated.txt +++ /dev/null @@ -1,7 +0,0 @@ -############################################################## -# DEPRECATED: this image is no longer updated. # -# Please migrate to codercom/enterprise-base:ubuntu # -# or build a custom image FROM it. # -# For more information see: # -# https://github.com/coder/enterprise-images/issues/238 # -############################################################## diff --git a/deprecated/golang/Dockerfile.ubuntu b/images/golang/Dockerfile.ubuntu similarity index 100% rename from deprecated/golang/Dockerfile.ubuntu rename to images/golang/Dockerfile.ubuntu diff --git a/deprecated/golang/README.md b/images/golang/README.md similarity index 81% rename from deprecated/golang/README.md rename to images/golang/README.md index 70e29150..c7718a1a 100644 --- a/deprecated/golang/README.md +++ b/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 From f8fe96c91f9c42bd521dd8ef130a5f3afd6609b5 Mon Sep 17 00:00:00 2001 From: Jullian Pepito Date: Thu, 3 Oct 2024 10:50:19 -0700 Subject: [PATCH 2/8] refactor(images/java): undeprecated enterprise-java --- deprecated/java/deprecated.txt | 7 ------- {deprecated => images}/java/Dockerfile.ubuntu | 0 {deprecated => images}/java/README.md | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 deprecated/java/deprecated.txt rename {deprecated => images}/java/Dockerfile.ubuntu (100%) rename {deprecated => images}/java/README.md (80%) diff --git a/deprecated/java/deprecated.txt b/deprecated/java/deprecated.txt deleted file mode 100644 index 60285084..00000000 --- a/deprecated/java/deprecated.txt +++ /dev/null @@ -1,7 +0,0 @@ -############################################################## -# DEPRECATED: this image is no longer updated. # -# Please migrate to codercom/enterprise-base:ubuntu # -# or build a custom image FROM it. # -# For more information see: # -# https://github.com/coder/enterprise-images/issues/238 # -############################################################## diff --git a/deprecated/java/Dockerfile.ubuntu b/images/java/Dockerfile.ubuntu similarity index 100% rename from deprecated/java/Dockerfile.ubuntu rename to images/java/Dockerfile.ubuntu diff --git a/deprecated/java/README.md b/images/java/README.md similarity index 80% rename from deprecated/java/README.md rename to images/java/README.md index e4f55c4f..755d52b9 100644 --- a/deprecated/java/README.md +++ b/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 From fcf0d366577c7eee0fab11aa9422b01744986175 Mon Sep 17 00:00:00 2001 From: Jullian Pepito Date: Thu, 3 Oct 2024 10:50:42 -0700 Subject: [PATCH 3/8] refactor(images/node): undeprecated enterprise-node --- deprecated/node/deprecated.txt | 7 ------- {deprecated => images}/node/Dockerfile.ubuntu | 0 {deprecated => images}/node/README.md | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 deprecated/node/deprecated.txt rename {deprecated => images}/node/Dockerfile.ubuntu (100%) rename {deprecated => images}/node/README.md (94%) diff --git a/deprecated/node/deprecated.txt b/deprecated/node/deprecated.txt deleted file mode 100644 index 60285084..00000000 --- a/deprecated/node/deprecated.txt +++ /dev/null @@ -1,7 +0,0 @@ -############################################################## -# DEPRECATED: this image is no longer updated. # -# Please migrate to codercom/enterprise-base:ubuntu # -# or build a custom image FROM it. # -# For more information see: # -# https://github.com/coder/enterprise-images/issues/238 # -############################################################## diff --git a/deprecated/node/Dockerfile.ubuntu b/images/node/Dockerfile.ubuntu similarity index 100% rename from deprecated/node/Dockerfile.ubuntu rename to images/node/Dockerfile.ubuntu diff --git a/deprecated/node/README.md b/images/node/README.md similarity index 94% rename from deprecated/node/README.md rename to images/node/README.md index 496ea202..b0ae4ae9 100644 --- a/deprecated/node/README.md +++ b/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) From c4e712653514719e32d4647a17031d604fb8a192 Mon Sep 17 00:00:00 2001 From: Jullian Pepito Date: Thu, 3 Oct 2024 10:51:02 -0700 Subject: [PATCH 4/8] feat(images/rstudio-server): added rstudio-server example image --- images/rstudio-server/Dockerfile | 71 ++++++++++++++++++++++++++++++++ images/rstudio-server/README.md | 6 +++ 2 files changed, 77 insertions(+) create mode 100644 images/rstudio-server/Dockerfile create mode 100644 images/rstudio-server/README.md diff --git a/images/rstudio-server/Dockerfile b/images/rstudio-server/Dockerfile new file mode 100644 index 00000000..cf7b573c --- /dev/null +++ b/images/rstudio-server/Dockerfile @@ -0,0 +1,71 @@ +FROM --platform=linux/amd64 codercom/enterprise-base:ubuntu + +USER root + +RUN apt update -y + +# R-Base +RUN < Date: Thu, 3 Oct 2024 10:53:32 -0700 Subject: [PATCH 5/8] refactor(images): removed deprecation notice --- images/golang/Dockerfile.ubuntu | 3 --- images/java/Dockerfile.ubuntu | 3 --- images/node/Dockerfile.ubuntu | 3 --- 3 files changed, 9 deletions(-) diff --git a/images/golang/Dockerfile.ubuntu b/images/golang/Dockerfile.ubuntu index 161d1a29..a1ca6337 100644 --- a/images/golang/Dockerfile.ubuntu +++ b/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 diff --git a/images/java/Dockerfile.ubuntu b/images/java/Dockerfile.ubuntu index 5d5fbeba..4f76efb2 100644 --- a/images/java/Dockerfile.ubuntu +++ b/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 diff --git a/images/node/Dockerfile.ubuntu b/images/node/Dockerfile.ubuntu index 27dda130..b466aca5 100644 --- a/images/node/Dockerfile.ubuntu +++ b/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 From bae76ceb0b4ab60282ce97d866eec95605fd0ae7 Mon Sep 17 00:00:00 2001 From: Jullian Pepito Date: Thu, 3 Oct 2024 11:18:56 -0700 Subject: [PATCH 6/8] fix(images/rstudio-server): fixed README and Dockerfile formatting --- images/rstudio-server/{Dockerfile => Dockerfile.ubuntu} | 2 +- images/rstudio-server/README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename images/rstudio-server/{Dockerfile => Dockerfile.ubuntu} (96%) diff --git a/images/rstudio-server/Dockerfile b/images/rstudio-server/Dockerfile.ubuntu similarity index 96% rename from images/rstudio-server/Dockerfile rename to images/rstudio-server/Dockerfile.ubuntu index cf7b573c..2d01157b 100644 --- a/images/rstudio-server/Dockerfile +++ b/images/rstudio-server/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 codercom/enterprise-base:ubuntu +FROM codercom/enterprise-base:ubuntu USER root diff --git a/images/rstudio-server/README.md b/images/rstudio-server/README.md index 4983475b..86860e19 100644 --- a/images/rstudio-server/README.md +++ b/images/rstudio-server/README.md @@ -1,6 +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. \ No newline at end of file +Wraps [enterprise-base](../base/README.md) and installs RStudio Server. From b5c2b40be9b5dc1b928b3c2d37c622614496b3b5 Mon Sep 17 00:00:00 2001 From: Jullian Pepito Date: Sat, 5 Oct 2024 02:01:24 -0700 Subject: [PATCH 7/8] refactor(images/rstudio-server): removed rstudio-server image --- images/rstudio-server/Dockerfile.ubuntu | 71 ------------------------- images/rstudio-server/README.md | 7 --- 2 files changed, 78 deletions(-) delete mode 100644 images/rstudio-server/Dockerfile.ubuntu delete mode 100644 images/rstudio-server/README.md diff --git a/images/rstudio-server/Dockerfile.ubuntu b/images/rstudio-server/Dockerfile.ubuntu deleted file mode 100644 index 2d01157b..00000000 --- a/images/rstudio-server/Dockerfile.ubuntu +++ /dev/null @@ -1,71 +0,0 @@ -FROM codercom/enterprise-base:ubuntu - -USER root - -RUN apt update -y - -# R-Base -RUN < Date: Tue, 15 Oct 2024 08:19:48 -0700 Subject: [PATCH 8/8] refactor: simplified README descriptions. --- images/golang/README.md | 2 +- images/java/README.md | 2 +- images/node/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/golang/README.md b/images/golang/README.md index c7718a1a..527dbc76 100644 --- a/images/golang/README.md +++ b/images/golang/README.md @@ -1,4 +1,4 @@ -# Example Golang +# Golang [![DockerPulls](https://img.shields.io/docker/pulls/codercom/enterprise-golang)](https://hub.docker.com/r/codercom/enterprise-golang) diff --git a/images/java/README.md b/images/java/README.md index 755d52b9..27d246da 100644 --- a/images/java/README.md +++ b/images/java/README.md @@ -1,4 +1,4 @@ -# Example Java +# Java [![Docker Pulls](https://img.shields.io/docker/pulls/codercom/enterprise-java?label=codercom%2Fenterprise-java)](https://hub.docker.com/r/codercom/enterprise-java) diff --git a/images/node/README.md b/images/node/README.md index b0ae4ae9..b7da053a 100644 --- a/images/node/README.md +++ b/images/node/README.md @@ -1,4 +1,4 @@ -# Example Node +# Node [![Docker Pulls](https://img.shields.io/docker/pulls/codercom/enterprise-node?label=codercom%2Fenterprise-node)](https://hub.docker.com/r/codercom/enterprise-node)