Skip to content

Commit 47910b3

Browse files
committed
1 parent c038f3f commit 47910b3

File tree

4 files changed

+0
-56
lines changed

4 files changed

+0
-56
lines changed

rdesktop-debian-xfce-arm64/Dockerfile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,41 @@ ENV MS_PACKAGES_DEB_PATH="$DOCKER_TMP_DIR/packages-microsoft-prod.deb"
77

88
# Create the temporary directory for Docker operations
99
RUN mkdir -p $DOCKER_TMP_DIR && \
10-
1110
# Update package lists for the apt package manager
1211
apt-get update && \
13-
1412
# Backup the modified exo-open file
1513
cp /usr/bin/exo-open /usr/bin/exo-open.bak && \
1614
mv /usr/bin/exo-open-real /usr/bin/exo-open && \
17-
1815
# Set the apt frontend to non-interactive mode for automated installs
1916
DEBIAN_FRONTEND=noninteractive \
20-
2117
# Upgrade installed packages to their latest versions
2218
apt-get upgrade -y && \
23-
2419
# Application tweaks to modify the behavior of the Chromium desktop entry
2520
# Reference: https://github.com/linuxserver/docker-rdesktop/blob/debian-xfce/Dockerfile
2621
echo "**** Application tweaks ****" && \
2722
sed -i 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' /usr/share/applications/chromium.desktop && \
2823
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
29-
3024
# Restore the modified exo-open file
3125
mv /usr/bin/exo-open.bak /usr/bin/exo-open && \
32-
3326
# Remove the screensaver autostart to improve the desktop experience
3427
echo "**** XFCE tweaks ****" && \
3528
rm -f /etc/xdg/autostart/xscreensaver.desktop && \
36-
3729
# Install required packages for functionality
3830
DEBIAN_FRONTEND=noninteractive apt-get install -y wget lsb-release git vim && \
39-
4031
# Download the Microsoft package for the current Debian release
4132
wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O $MS_PACKAGES_DEB_PATH && \
42-
4333
# Install the Microsoft package
4434
dpkg -i $MS_PACKAGES_DEB_PATH && \
45-
4635
# Remove the downloaded Microsoft package to save space
4736
rm $MS_PACKAGES_DEB_PATH && \
48-
4937
# Update package lists again after adding the Microsoft package repository
5038
apt-get update && \
51-
5239
# Ensure the man1 directory exists for manual pages
5340
mkdir -p /usr/share/man/man1 && \
54-
5541
# Install Microsoft OpenJDK 21 for Java applications
5642
DEBIAN_FRONTEND=noninteractive apt-get install -y msopenjdk-21 && \
57-
5843
# Clean up apt cache to reduce image size
5944
apt-get clean && \
60-
6145
# Remove unnecessary files to reduce final image size
6246
rm -rf \
6347
/config/.cache \

rdesktop-ubuntu-kde-arm64/Dockerfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,36 @@ ENV MS_PACKAGES_DEB_PATH="$DOCKER_TMP_DIR/packages-microsoft-prod.deb"
77

88
# Create the temporary directory for Docker operations
99
RUN mkdir -p $DOCKER_TMP_DIR && \
10-
1110
# Update package lists for the apt package manager
1211
apt-get update && \
13-
1412
# Set the apt frontend to non-interactive mode for automated installs
1513
DEBIAN_FRONTEND=noninteractive \
16-
1714
# Upgrade installed packages to their latest versions
1815
apt-get upgrade -y && \
19-
2016
# Indicate that KDE tweaks are being applied
2117
echo "**** KDE tweaks ****" && \
22-
2318
# Modify the Plasma task manager to prioritize the Konsole application
2419
# Reference: https://github.com/linuxserver/docker-rdesktop/blob/ubuntu-kde/Dockerfile
2520
sed -i 's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
2621
/usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
27-
2822
# Install essential packages required for the setup
2923
DEBIAN_FRONTEND=noninteractive apt-get install -y wget lsb-release apt-transport-https git vim && \
30-
3124
# Get the current Ubuntu version to construct the Microsoft package URL
3225
ubuntu_release=$(lsb_release -rs) && \
33-
3426
# Download the Microsoft package repository configuration for Ubuntu
3527
wget https://packages.microsoft.com/config/ubuntu/${ubuntu_release}/packages-microsoft-prod.deb -O $MS_PACKAGES_DEB_PATH && \
36-
3728
# Install the downloaded Microsoft package
3829
dpkg -i $MS_PACKAGES_DEB_PATH && \
39-
4030
# Remove the downloaded Microsoft package to free up space
4131
rm $MS_PACKAGES_DEB_PATH && \
42-
4332
# Update package lists again after adding the Microsoft repository
4433
apt-get update && \
45-
4634
# Ensure the man1 directory exists for storing manual pages
4735
mkdir -p /usr/share/man/man1 && \
48-
4936
# Install Microsoft OpenJDK 21
5037
DEBIAN_FRONTEND=noninteractive apt-get install -y msopenjdk-21 && \
51-
5238
# Clean up the apt cache to reduce the final image size
5339
apt-get clean && \
54-
5540
# Remove unnecessary files to minimize image size
5641
rm -rf \
5742
/config/.cache \

tailscale-over-cloudflare-warp-arm64/Dockerfile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,29 @@ COPY entrypoint.sh /entrypoint.sh
1212
RUN apt-get update && \
1313
# Set the apt frontend to non-interactive mode for automated installs
1414
DEBIAN_FRONTEND=noninteractive \
15-
1615
apt-get upgrade -y && \
17-
1816
# Install required utilities for package management and GPG handling
1917
DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg lsb-release ethtool && \
20-
2118
# Import the Cloudflare GPG key for package verification
2219
curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | \
2320
gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg && \
24-
2521
# Add the Cloudflare APT repository to the sources list
2622
echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | \
2723
tee /etc/apt/sources.list.d/cloudflare-client.list && \
28-
2924
# Update the package index after adding the new repository
3025
apt-get update && \
31-
3226
# Install the Cloudflare WARP client
3327
DEBIAN_FRONTEND=noninteractive apt-get install -y cloudflare-warp && \
34-
3528
# Download and install Tailscale using its installation script
3629
curl -fsSL https://tailscale.com/install.sh | sh && \
37-
3830
# Clean up APT caches and temporary files to minimize the final image size
3931
apt-get clean && \
4032
rm -rf /var/lib/apt/lists/* && \
41-
4233
# Remove the state directories for Tailscale and Cloudflare WARP to ensure they are empty in the image
4334
rm -rf /var/lib/tailscale && \
4435
rm -rf /var/lib/cloudflare-warp && \
45-
4636
# Make the entrypoint script executable to ensure it can be run at container start
4737
chmod +x /entrypoint.sh && \
48-
4938
# Create necessary directories for WARP and pre-accept TOS (terms of service)
5039
mkdir -p /home/ubuntu/.local/share/warp && \
5140
echo -n 'yes' > /home/ubuntu/.local/share/warp/accepted-tos.txt && \

tailscale-over-gluetun-arm64/Dockerfile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,32 @@ COPY --from=docker.io/tailscale/tailscale:latest /usr/local/bin/tailscale /app/t
1111
# Update the package list, upgrade existing packages, and install necessary dependencies.
1212
RUN apk update && \
1313
apk upgrade && \
14-
1514
# Create directories for Tailscale to use.
1615
mkdir -p /var/run/tailscale /var/cache/tailscale /var/lib/tailscale && \
17-
1816
# Install wget and ethtool, also without cache for image efficiency.
1917
apk add --no-cache --update -l wget ethtool && \
20-
2118
# Install a specific version of OpenVPN (version 2.5) from the main repository.
2219
apk add --no-cache --update --repository=https://dl-cdn.alpinelinux.org/alpine/v3.17/main openvpn\~2.5 && \
23-
2420
# Remove the existing OpenVPN binary to avoid conflicts.
2521
rm -rf /usr/sbin/openvpn2.5 && \
26-
2722
# Rename the current OpenVPN binary for versioning.
2823
mv /usr/sbin/openvpn /usr/sbin/openvpn2.5 && \
29-
3024
# Uninstall the default OpenVPN package to clean up.
3125
apk del openvpn && \
32-
3326
# Reinstall OpenVPN and other necessary packages including CA certificates and iptables.
3427
apk add --no-cache --update openvpn ca-certificates iptables iptables-legacy tzdata && \
35-
3628
# Remove any residual OpenVPN binary for the latest version.
3729
rm -rf /usr/sbin/openvpn2.6 && \
38-
3930
# Rename the newly installed OpenVPN binary for versioning.
4031
mv /usr/sbin/openvpn /usr/sbin/openvpn2.6 && \
41-
4232
# Clean up unnecessary files to reduce the final image size.
4333
rm -rf /var/cache/apk/* /etc/openvpn/*.sh /usr/lib/openvpn/plugins/openvpn-plugin-down-root.so && \
44-
4534
# Remove the default OpenVPN user created during installation.
4635
deluser openvpn && \
47-
4836
# Create a directory for Gluetun configurations or data.
4937
mkdir -p /gluetun && \
50-
5138
# Ensure /gluetun is empty.
5239
rm -rf /gluetun && \
53-
5440
# Add execution permission to the entrypoint script.
5541
chmod +x /entrypoint.sh
5642

0 commit comments

Comments
 (0)