From 2720330789591f8878ec9f953a67777db3e4a86b Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <dominique.marcadet@centralesupelec.fr>
Date: Tue, 25 Oct 2022 16:03:31 +0200
Subject: [PATCH] clean master branch
---
Dockerfile | 28 -------------------
Makefile | 8 ------
README.md | 14 ++--------
root/etc/nginx/sites-available/default.local | 10 -------
.../nginx/sites-available/default.mydocker | 12 --------
.../svc-nginx/dependencies.d/init-services | 0
.../s6-rc.d/svc-nginx/dependencies.d/svc-web | 0
.../s6-rc.d/svc-nginx/notification-fd | 1 -
root/etc/s6-overlay/s6-rc.d/svc-nginx/run | 2 --
root/etc/s6-overlay/s6-rc.d/svc-nginx/type | 1 -
.../s6-rc.d/user/contents.d/svc-nginx | 0
root/usr/local/lib/wrapper_script.sh | 12 --------
12 files changed, 2 insertions(+), 86 deletions(-)
delete mode 100644 Dockerfile
delete mode 100644 Makefile
delete mode 100644 root/etc/nginx/sites-available/default.local
delete mode 100644 root/etc/nginx/sites-available/default.mydocker
delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies.d/init-services
delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies.d/svc-web
delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-nginx/notification-fd
delete mode 100755 root/etc/s6-overlay/s6-rc.d/svc-nginx/run
delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-nginx/type
delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nginx
delete mode 100755 root/usr/local/lib/wrapper_script.sh
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 0b1be73..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM lscr.io/linuxserver/webtop:ubuntu-kde
-
-RUN \
- echo "**** install runtime dependencies ****" && \
- apt-get update && \
- apt-get install -y \
- nginx \
- apache2-utils
-
-RUN \
- sed -i 's/worker_processes auto;/worker_processes 1;/' /etc/nginx/nginx.conf
-
-RUN \
- echo "**** clean up ****" && \
- apt-get clean && \
- rm -rf \
- /tmp/* \
- /var/lib/apt/lists/* \
- /var/tmp/*
-
-## add local files
-COPY /root /
-
-## launch
-ENTRYPOINT ["/bin/bash", "/usr/local/lib/wrapper_script.sh"]
-
-## nginx reverse proxy
-EXPOSE 3080
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bb96bcc..0000000
--- a/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-REPO = gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-webtop
-TAG = latest
-
-all:
- docker buildx create --use --node new-builder
- docker buildx build --push --platform "linux/amd64","linux/arm64" --tag "${REPO}:${TAG}" .
-
diff --git a/README.md b/README.md
index 25b5419..26bdfe5 100644
--- a/README.md
+++ b/README.md
@@ -13,16 +13,6 @@ which is maintained and quite often updated.
has been added. Trying to use the PASSWORD setting of [guacamole client From Linuxserver](https://github.com/linuxserver/gclient)
was not succesful.
-## Details
-
-- The exposed ports are 3000 (VNC with a Web Browser), 3080 (nginx reverse proxy) and 3089
-(RDP)
-- The user folder is `/config`
-- the user and sudo password is `abc`
-- if docker is installed on your computer, you can run (amd64 or arm64 architecture) this
- image, assuming you are in a specific folder that will be shared with the container at
- `/config`, with:
-
- `docker run -p 3000:3000 -v "$(pwd):/config"
- gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-webtop`
+## Usage
+- Choose one of the available branch (`kde` or `icewm`).
diff --git a/root/etc/nginx/sites-available/default.local b/root/etc/nginx/sites-available/default.local
deleted file mode 100644
index e504694..0000000
--- a/root/etc/nginx/sites-available/default.local
+++ /dev/null
@@ -1,10 +0,0 @@
-server {
- listen 3080 default_server;
- location / {
- proxy_pass http://localhost:3000;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- proxy_read_timeout 120s;
- }
-}
diff --git a/root/etc/nginx/sites-available/default.mydocker b/root/etc/nginx/sites-available/default.mydocker
deleted file mode 100644
index 55fb7dc..0000000
--- a/root/etc/nginx/sites-available/default.mydocker
+++ /dev/null
@@ -1,12 +0,0 @@
-server {
- listen 3080 default_server;
- location / {
- proxy_pass http://localhost:3000;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- proxy_read_timeout 120s;
- auth_basic "Username is abc";
- auth_basic_user_file /etc/nginx/htpasswd;
- }
-}
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies.d/init-services
deleted file mode 100644
index e69de29..0000000
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies.d/svc-web b/root/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies.d/svc-web
deleted file mode 100644
index e69de29..0000000
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nginx/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-nginx/notification-fd
deleted file mode 100644
index c793025..0000000
--- a/root/etc/s6-overlay/s6-rc.d/svc-nginx/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nginx/run b/root/etc/s6-overlay/s6-rc.d/svc-nginx/run
deleted file mode 100755
index 06c4088..0000000
--- a/root/etc/s6-overlay/s6-rc.d/svc-nginx/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/command/execlineb -P
-nginx -g "daemon off;"
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nginx/type b/root/etc/s6-overlay/s6-rc.d/svc-nginx/type
deleted file mode 100644
index 1780f9f..0000000
--- a/root/etc/s6-overlay/s6-rc.d/svc-nginx/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nginx b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nginx
deleted file mode 100644
index e69de29..0000000
diff --git a/root/usr/local/lib/wrapper_script.sh b/root/usr/local/lib/wrapper_script.sh
deleted file mode 100755
index 94a5117..0000000
--- a/root/usr/local/lib/wrapper_script.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-rm /etc/nginx/sites-enabled/default
-if [ -z $2 ]; then
- ln -s /etc/nginx/sites-available/default.local /etc/nginx/sites-enabled/default
-else
- ln -s /etc/nginx/sites-available/default.mydocker /etc/nginx/sites-enabled/default
- # <password> is ${2}
- htpasswd -bc /etc/nginx/htpasswd abc "${2}"
-fi
-
-exec /init
--
GitLab