From 276281e7e43abdf2492e5e176851501300ecb3a5 Mon Sep 17 00:00:00 2001 From: mserranom Date: Mon, 17 Feb 2020 13:56:49 +0100 Subject: [PATCH] moved files from docker-image imported repo to root --- server-ce/{docker-image => }/.dockerignore | 0 server-ce/{docker-image => }/.editorconfig | 0 server-ce/{docker-image => }/Dockerfile | 0 server-ce/{docker-image => }/Dockerfile-base | 0 server-ce/{docker-image => }/Makefile | 0 server-ce/{docker-image => }/git-revision.sh | 0 server-ce/{docker-image => }/hotfix/2.0.1/Dockerfile | 0 .../hotfix/2.0.1/create_and_destroy_users.patch | 0 .../{docker-image => }/hotfix/2.0.1/disable_project_history.patch | 0 server-ce/{docker-image => }/hotfix/2.0.2/1-anon-upload.patch | 0 .../{docker-image => }/hotfix/2.0.2/2-read-only-access.patch | 0 server-ce/{docker-image => }/hotfix/2.0.2/3-url-linking-1.patch | 0 server-ce/{docker-image => }/hotfix/2.0.2/4-url-linking-2.patch | 0 .../{docker-image => }/hotfix/2.0.2/5-disable-analytics-1.patch | 0 .../{docker-image => }/hotfix/2.0.2/6-disable-analytics-2.patch | 0 server-ce/{docker-image => }/hotfix/2.0.2/Dockerfile | 0 server-ce/{docker-image => }/hotfix/2.1.1/Dockerfile | 0 .../{docker-image => }/hotfix/2.1.1/add-recaptcha-config.patch | 0 .../init_scripts/00_make_sharelatex_data_dirs.sh | 0 .../init_scripts/00_regen_sharelatex_secrets.sh | 0 .../init_scripts/00_set_docker_host_ipaddress.sh | 0 server-ce/{docker-image => }/init_scripts/98_check_db_access.sh | 0 server-ce/{docker-image => }/init_scripts/99_migrate.sh | 0 server-ce/{docker-image => }/logrotate/sharelatex | 0 server-ce/{docker-image => }/nginx/nginx.conf | 0 server-ce/{docker-image => }/nginx/sharelatex.conf | 0 server-ce/{docker-image => }/runit/chat-sharelatex/run | 0 server-ce/{docker-image => }/runit/clsi-sharelatex/run | 0 server-ce/{docker-image => }/runit/contacts-sharelatex/run | 0 server-ce/{docker-image => }/runit/docstore-sharelatex/run | 0 .../{docker-image => }/runit/document-updater-sharelatex/run | 0 server-ce/{docker-image => }/runit/filestore-sharelatex/run | 0 server-ce/{docker-image => }/runit/nginx/run | 0 server-ce/{docker-image => }/runit/notifications-sharelatex/run | 0 server-ce/{docker-image => }/runit/real-time-sharelatex/run | 0 server-ce/{docker-image => }/runit/spelling-sharelatex/run | 0 server-ce/{docker-image => }/runit/tags-sharelatex/run | 0 server-ce/{docker-image => }/runit/track-changes-sharelatex/run | 0 server-ce/{docker-image => }/runit/web-sharelatex/run | 0 server-ce/{docker-image => }/services.js | 0 server-ce/{docker-image => }/settings.coffee | 0 41 files changed, 0 insertions(+), 0 deletions(-) rename server-ce/{docker-image => }/.dockerignore (100%) rename server-ce/{docker-image => }/.editorconfig (100%) rename server-ce/{docker-image => }/Dockerfile (100%) rename server-ce/{docker-image => }/Dockerfile-base (100%) rename server-ce/{docker-image => }/Makefile (100%) rename server-ce/{docker-image => }/git-revision.sh (100%) rename server-ce/{docker-image => }/hotfix/2.0.1/Dockerfile (100%) rename server-ce/{docker-image => }/hotfix/2.0.1/create_and_destroy_users.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.1/disable_project_history.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/1-anon-upload.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/2-read-only-access.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/3-url-linking-1.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/4-url-linking-2.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/5-disable-analytics-1.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/6-disable-analytics-2.patch (100%) rename server-ce/{docker-image => }/hotfix/2.0.2/Dockerfile (100%) rename server-ce/{docker-image => }/hotfix/2.1.1/Dockerfile (100%) rename server-ce/{docker-image => }/hotfix/2.1.1/add-recaptcha-config.patch (100%) rename server-ce/{docker-image => }/init_scripts/00_make_sharelatex_data_dirs.sh (100%) rename server-ce/{docker-image => }/init_scripts/00_regen_sharelatex_secrets.sh (100%) rename server-ce/{docker-image => }/init_scripts/00_set_docker_host_ipaddress.sh (100%) rename server-ce/{docker-image => }/init_scripts/98_check_db_access.sh (100%) rename server-ce/{docker-image => }/init_scripts/99_migrate.sh (100%) rename server-ce/{docker-image => }/logrotate/sharelatex (100%) rename server-ce/{docker-image => }/nginx/nginx.conf (100%) rename server-ce/{docker-image => }/nginx/sharelatex.conf (100%) rename server-ce/{docker-image => }/runit/chat-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/clsi-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/contacts-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/docstore-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/document-updater-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/filestore-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/nginx/run (100%) rename server-ce/{docker-image => }/runit/notifications-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/real-time-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/spelling-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/tags-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/track-changes-sharelatex/run (100%) rename server-ce/{docker-image => }/runit/web-sharelatex/run (100%) rename server-ce/{docker-image => }/services.js (100%) rename server-ce/{docker-image => }/settings.coffee (100%) diff --git a/server-ce/docker-image/.dockerignore b/server-ce/.dockerignore similarity index 100% rename from server-ce/docker-image/.dockerignore rename to server-ce/.dockerignore diff --git a/server-ce/docker-image/.editorconfig b/server-ce/.editorconfig similarity index 100% rename from server-ce/docker-image/.editorconfig rename to server-ce/.editorconfig diff --git a/server-ce/docker-image/Dockerfile b/server-ce/Dockerfile similarity index 100% rename from server-ce/docker-image/Dockerfile rename to server-ce/Dockerfile diff --git a/server-ce/docker-image/Dockerfile-base b/server-ce/Dockerfile-base similarity index 100% rename from server-ce/docker-image/Dockerfile-base rename to server-ce/Dockerfile-base diff --git a/server-ce/docker-image/Makefile b/server-ce/Makefile similarity index 100% rename from server-ce/docker-image/Makefile rename to server-ce/Makefile diff --git a/server-ce/docker-image/git-revision.sh b/server-ce/git-revision.sh similarity index 100% rename from server-ce/docker-image/git-revision.sh rename to server-ce/git-revision.sh diff --git a/server-ce/docker-image/hotfix/2.0.1/Dockerfile b/server-ce/hotfix/2.0.1/Dockerfile similarity index 100% rename from server-ce/docker-image/hotfix/2.0.1/Dockerfile rename to server-ce/hotfix/2.0.1/Dockerfile diff --git a/server-ce/docker-image/hotfix/2.0.1/create_and_destroy_users.patch b/server-ce/hotfix/2.0.1/create_and_destroy_users.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.1/create_and_destroy_users.patch rename to server-ce/hotfix/2.0.1/create_and_destroy_users.patch diff --git a/server-ce/docker-image/hotfix/2.0.1/disable_project_history.patch b/server-ce/hotfix/2.0.1/disable_project_history.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.1/disable_project_history.patch rename to server-ce/hotfix/2.0.1/disable_project_history.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/1-anon-upload.patch b/server-ce/hotfix/2.0.2/1-anon-upload.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/1-anon-upload.patch rename to server-ce/hotfix/2.0.2/1-anon-upload.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/2-read-only-access.patch b/server-ce/hotfix/2.0.2/2-read-only-access.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/2-read-only-access.patch rename to server-ce/hotfix/2.0.2/2-read-only-access.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/3-url-linking-1.patch b/server-ce/hotfix/2.0.2/3-url-linking-1.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/3-url-linking-1.patch rename to server-ce/hotfix/2.0.2/3-url-linking-1.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/4-url-linking-2.patch b/server-ce/hotfix/2.0.2/4-url-linking-2.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/4-url-linking-2.patch rename to server-ce/hotfix/2.0.2/4-url-linking-2.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/5-disable-analytics-1.patch b/server-ce/hotfix/2.0.2/5-disable-analytics-1.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/5-disable-analytics-1.patch rename to server-ce/hotfix/2.0.2/5-disable-analytics-1.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/6-disable-analytics-2.patch b/server-ce/hotfix/2.0.2/6-disable-analytics-2.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/6-disable-analytics-2.patch rename to server-ce/hotfix/2.0.2/6-disable-analytics-2.patch diff --git a/server-ce/docker-image/hotfix/2.0.2/Dockerfile b/server-ce/hotfix/2.0.2/Dockerfile similarity index 100% rename from server-ce/docker-image/hotfix/2.0.2/Dockerfile rename to server-ce/hotfix/2.0.2/Dockerfile diff --git a/server-ce/docker-image/hotfix/2.1.1/Dockerfile b/server-ce/hotfix/2.1.1/Dockerfile similarity index 100% rename from server-ce/docker-image/hotfix/2.1.1/Dockerfile rename to server-ce/hotfix/2.1.1/Dockerfile diff --git a/server-ce/docker-image/hotfix/2.1.1/add-recaptcha-config.patch b/server-ce/hotfix/2.1.1/add-recaptcha-config.patch similarity index 100% rename from server-ce/docker-image/hotfix/2.1.1/add-recaptcha-config.patch rename to server-ce/hotfix/2.1.1/add-recaptcha-config.patch diff --git a/server-ce/docker-image/init_scripts/00_make_sharelatex_data_dirs.sh b/server-ce/init_scripts/00_make_sharelatex_data_dirs.sh similarity index 100% rename from server-ce/docker-image/init_scripts/00_make_sharelatex_data_dirs.sh rename to server-ce/init_scripts/00_make_sharelatex_data_dirs.sh diff --git a/server-ce/docker-image/init_scripts/00_regen_sharelatex_secrets.sh b/server-ce/init_scripts/00_regen_sharelatex_secrets.sh similarity index 100% rename from server-ce/docker-image/init_scripts/00_regen_sharelatex_secrets.sh rename to server-ce/init_scripts/00_regen_sharelatex_secrets.sh diff --git a/server-ce/docker-image/init_scripts/00_set_docker_host_ipaddress.sh b/server-ce/init_scripts/00_set_docker_host_ipaddress.sh similarity index 100% rename from server-ce/docker-image/init_scripts/00_set_docker_host_ipaddress.sh rename to server-ce/init_scripts/00_set_docker_host_ipaddress.sh diff --git a/server-ce/docker-image/init_scripts/98_check_db_access.sh b/server-ce/init_scripts/98_check_db_access.sh similarity index 100% rename from server-ce/docker-image/init_scripts/98_check_db_access.sh rename to server-ce/init_scripts/98_check_db_access.sh diff --git a/server-ce/docker-image/init_scripts/99_migrate.sh b/server-ce/init_scripts/99_migrate.sh similarity index 100% rename from server-ce/docker-image/init_scripts/99_migrate.sh rename to server-ce/init_scripts/99_migrate.sh diff --git a/server-ce/docker-image/logrotate/sharelatex b/server-ce/logrotate/sharelatex similarity index 100% rename from server-ce/docker-image/logrotate/sharelatex rename to server-ce/logrotate/sharelatex diff --git a/server-ce/docker-image/nginx/nginx.conf b/server-ce/nginx/nginx.conf similarity index 100% rename from server-ce/docker-image/nginx/nginx.conf rename to server-ce/nginx/nginx.conf diff --git a/server-ce/docker-image/nginx/sharelatex.conf b/server-ce/nginx/sharelatex.conf similarity index 100% rename from server-ce/docker-image/nginx/sharelatex.conf rename to server-ce/nginx/sharelatex.conf diff --git a/server-ce/docker-image/runit/chat-sharelatex/run b/server-ce/runit/chat-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/chat-sharelatex/run rename to server-ce/runit/chat-sharelatex/run diff --git a/server-ce/docker-image/runit/clsi-sharelatex/run b/server-ce/runit/clsi-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/clsi-sharelatex/run rename to server-ce/runit/clsi-sharelatex/run diff --git a/server-ce/docker-image/runit/contacts-sharelatex/run b/server-ce/runit/contacts-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/contacts-sharelatex/run rename to server-ce/runit/contacts-sharelatex/run diff --git a/server-ce/docker-image/runit/docstore-sharelatex/run b/server-ce/runit/docstore-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/docstore-sharelatex/run rename to server-ce/runit/docstore-sharelatex/run diff --git a/server-ce/docker-image/runit/document-updater-sharelatex/run b/server-ce/runit/document-updater-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/document-updater-sharelatex/run rename to server-ce/runit/document-updater-sharelatex/run diff --git a/server-ce/docker-image/runit/filestore-sharelatex/run b/server-ce/runit/filestore-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/filestore-sharelatex/run rename to server-ce/runit/filestore-sharelatex/run diff --git a/server-ce/docker-image/runit/nginx/run b/server-ce/runit/nginx/run similarity index 100% rename from server-ce/docker-image/runit/nginx/run rename to server-ce/runit/nginx/run diff --git a/server-ce/docker-image/runit/notifications-sharelatex/run b/server-ce/runit/notifications-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/notifications-sharelatex/run rename to server-ce/runit/notifications-sharelatex/run diff --git a/server-ce/docker-image/runit/real-time-sharelatex/run b/server-ce/runit/real-time-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/real-time-sharelatex/run rename to server-ce/runit/real-time-sharelatex/run diff --git a/server-ce/docker-image/runit/spelling-sharelatex/run b/server-ce/runit/spelling-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/spelling-sharelatex/run rename to server-ce/runit/spelling-sharelatex/run diff --git a/server-ce/docker-image/runit/tags-sharelatex/run b/server-ce/runit/tags-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/tags-sharelatex/run rename to server-ce/runit/tags-sharelatex/run diff --git a/server-ce/docker-image/runit/track-changes-sharelatex/run b/server-ce/runit/track-changes-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/track-changes-sharelatex/run rename to server-ce/runit/track-changes-sharelatex/run diff --git a/server-ce/docker-image/runit/web-sharelatex/run b/server-ce/runit/web-sharelatex/run similarity index 100% rename from server-ce/docker-image/runit/web-sharelatex/run rename to server-ce/runit/web-sharelatex/run diff --git a/server-ce/docker-image/services.js b/server-ce/services.js similarity index 100% rename from server-ce/docker-image/services.js rename to server-ce/services.js diff --git a/server-ce/docker-image/settings.coffee b/server-ce/settings.coffee similarity index 100% rename from server-ce/docker-image/settings.coffee rename to server-ce/settings.coffee