Skip to content

feat: add enterprise-desktop image #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2024
Merged

feat: add enterprise-desktop image #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cb5d6f
Add enterprise-desktop image
matifali Oct 16, 2024
c4fc5dd
Ensure newline at end of Dockerfile
matifali Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions images/desktop/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Desktop

[![DockerPulls](https://img.shields.io/docker/pulls/codercom/enterprise-desktop)](https://hub.docker.com/r/codercom/enterprise-desktop)

## Description

Wraps [enterprise-base](../base/README.md) with a xfce desktop environment.

> **Note:** This image does not contain a vnc-server.
> A VNC server can be added by using the [KasmVNC](https://registry.coder.com/modules/kasmvnc) module.

## How To Use

This image is intended to be used as a base image for a templates using the
[KasmVNC](https://registry.coder.com/modules/kasmvnc) module.
16 changes: 16 additions & 0 deletions images/desktop/ubuntu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM codercom/enterprise-base:latest

USER root

RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install -y --no-install-recommends --no-install-suggests dbus-x11 openssl ssl-cert libdatetime-perl xfce4 xfce4-goodies && \
rm /run/reboot-required* || true

# Setting the required environment variables
ARG USER=coder
RUN echo 'LANG=en_US.UTF-8' >> /etc/default/locale; \
echo 'export GNOME_SHELL_SESSION_MODE=ubuntu' > /home/$USER/.xsessionrc; \
echo 'export XDG_CURRENT_DESKTOP=xfce' >> /home/$USER/.xsessionrc; \
echo 'export XDG_SESSION_TYPE=x11' >> /home/$USER/.xsessionrc;

USER coder
Copy link
Contributor

@jatcod3r jatcod3r Oct 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this just might be an issue on my end, but running the format checker against the Dockerfile I get this:

$ dprint check --plugins https://plugins.dprint.dev/dockerfile-0.3.0.wasm https://plugins.dprint.dev/markdown-0.17.0.wasm
from /Users/****/Desktop/Projects/test-templates/enterprise-desktop/ubuntu.Dockerfile:
13 13| ····echo·'export·XDG_CURRENT_DESKTOP=xfce'·>>·/home/$USER/.xsessionrc;·\
14 14| ····echo·'export·XDG_SESSION_TYPE=x11'·>>·/home/$USER/.xsessionrc;
15 15| 
   16|-USER·coder␃
16   |+USER·coder
--

Shows an error with there being no newline at the end of USER coder. Adding a newline fixes it, but never ran into this when reintroducing the golang, node, and java images.

If you do see this error though during the build job, this might be the solution just in case. Everything looks good though!

1 change: 1 addition & 0 deletions scripts/images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ IMAGES=(
"golang"
"java"
"node"
"desktop"
)