From 9e77f28bf6da9175d18962b9f5ced63510ec9f05 Mon Sep 17 00:00:00 2001 From: Vincent von Hof Date: Wed, 20 Apr 2016 12:54:11 +0200 Subject: [PATCH 1/6] Fix a typo in README.md nothing here...moving on --- server-ce/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/README.md b/server-ce/README.md index 93e330a74f..af2b50a377 100644 --- a/server-ce/README.md +++ b/server-ce/README.md @@ -1,4 +1,4 @@ -ShareLaTeX Comunity Docker Image +ShareLaTeX Community Docker Image ======================= **Please read this entire file before installing ShareLaTeX via Docker. It's only From e994ac8f1f514090eee5291c526ff5212feca64b Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Wed, 20 Apr 2016 21:55:47 -0300 Subject: [PATCH 2/6] add support for grunt build --- server-ce/Dockerfile | 11 ++++++++-- server-ce/Gruntfile.coffee | 38 +++++++++++++++++++++++++++++++++ server-ce/git-revision.js | 22 +++++++++++++++++++ server-ce/package.json | 11 ++++++++++ server-ce/services.js | 43 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 server-ce/Gruntfile.coffee create mode 100644 server-ce/git-revision.js create mode 100644 server-ce/package.json create mode 100644 server-ce/services.js diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index ff52a33198..7d813bd5d5 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -14,15 +14,22 @@ RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharela # Install ShareLaTeX RUN apt-get install -y git python -RUN git clone -b release https://github.com/sharelatex/sharelatex.git /var/www/sharelatex -RUN cd /var/www/sharelatex && git pull origin release +RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex # zlib1g-dev is needed to compile the synctex binaries in the CLSI during `grunt install`. RUN apt-get install -y zlib1g-dev + +ADD services.js /var/www/sharelatex/config/services.js +ADD package.json /var/www/package.json +ADD git-revision.js /var/www/git-revision.js +RUN cd /var/www && npm install + RUN cd /var/www/sharelatex; \ npm install; \ grunt install; + +RUN cd /var/www && node git-revision > revisions.txt # Minify js assets RUN cd /var/www/sharelatex/web; \ diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee new file mode 100644 index 0000000000..0f1d222059 --- /dev/null +++ b/server-ce/Gruntfile.coffee @@ -0,0 +1,38 @@ +services = require('./services') + +module.exports = (grunt) -> + + tag = grunt.option("tag") or 'latest' + repos = [] + for service in services + url = service.repo.split('/') + owner = url[3] + repo = url[4].replace('.git','') + repos.push "/repos/#{owner}/#{repo}/git/refs/heads/#{service.version}" + + grunt.initConfig + docker_io: + default_options: + options: + dockerFileLocation: '.' + buildName: 'sharelatex' + tag: grunt.option('tag') or 'latest' + push: grunt.option('push') or false + force: true + + github: + combinedRevisions: + options: + #oAuth: + # access_token: '' + concat: true + src: repos + dest: 'version/' + tag + '.json' + + grunt.loadNpmTasks 'grunt-docker-io' + grunt.loadNpmTasks 'grunt-github-api' + + grunt.registerTask 'build', ['docker_io', 'github'] + grunt.registerTask 'gitrev', ['github'] + + grunt.registerTask 'default', ['build'] diff --git a/server-ce/git-revision.js b/server-ce/git-revision.js new file mode 100644 index 0000000000..89359cea2e --- /dev/null +++ b/server-ce/git-revision.js @@ -0,0 +1,22 @@ +var simple = require('simple-git'); +var services = require('./sharelatex/config/services'); +const fs = require('fs'); + +function print_latest(repoDir) { + git = simple(repoDir); + opt = []; + opt['max-count'] = 1; + git.log(opt, function(err, log) { + if (!err) { + console.log(repoDir + ',' + log.latest.hash); + } + }) +} + +for (id in services) { + service = services[id]; + dirPath = __dirname + '/sharelatex/'+service.name; + if (fs.existsSync(dirPath)) { + print_latest(dirPath); + } +} diff --git a/server-ce/package.json b/server-ce/package.json new file mode 100644 index 0000000000..329169d96d --- /dev/null +++ b/server-ce/package.json @@ -0,0 +1,11 @@ +{ + "name": "none", + "author": "none", + "description": "none", + "dependencies": { + "grunt": "^0.4.5", + "grunt-docker-io": "^0.7.0", + "simple-git": "^1.32.1", + "grunt-github-api": "^0.2.3" + } +} diff --git a/server-ce/services.js b/server-ce/services.js new file mode 100644 index 0000000000..be4da8698a --- /dev/null +++ b/server-ce/services.js @@ -0,0 +1,43 @@ +module.exports = + +[{ + name: "web", + repo: "https://github.com/sharelatex/web-sharelatex.git", + version: "master" +}, { + name: "real-time", + repo: "https://github.com/sharelatex/real-time-sharelatex.git", + version: "master" +}, { + name: "document-updater", + repo: "https://github.com/sharelatex/document-updater-sharelatex.git", + version: "master" +}, { + name: "clsi", + repo: "https://github.com/sharelatex/clsi-sharelatex.git", + version: "master" +}, { + name: "filestore", + repo: "https://github.com/sharelatex/filestore-sharelatex.git", + version: "master" +}, { + name: "track-changes", + repo: "https://github.com/sharelatex/track-changes-sharelatex.git", + version: "master" +}, { + name: "docstore", + repo: "https://github.com/sharelatex/docstore-sharelatex.git", + version: "master" +}, { + name: "chat", + repo: "https://github.com/sharelatex/chat-sharelatex.git", + version: "master" +}, { + name: "tags", + repo: "https://github.com/sharelatex/tags-sharelatex.git", + version: "master" +}, { + name: "spelling", + repo: "https://github.com/sharelatex/spelling-sharelatex.git", + version: "master" +}] From 5fe0deab6dff1b29ccd6ff6fb8d2d43734731d00 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 28 Apr 2016 12:01:30 +0100 Subject: [PATCH 3/6] recommend mongodb 3.x --- server-ce/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/README.md b/server-ce/README.md index af2b50a377..e1a0c228b3 100644 --- a/server-ce/README.md +++ b/server-ce/README.md @@ -36,7 +36,7 @@ docker rm sharelatex ### Mongo and Redis -ShareLaTeX depends on [MongoDB](http://www.mongodb.org/) (must be 2.4 or later), and +ShareLaTeX depends on [MongoDB](http://www.mongodb.org/) (must be 2.4 or later, 3.x is recommended), and [Redis](http://redis.io/) (must be version 2.6.12 or later). These should be running on the host system. From 3e7595f3f2784e9dd63c4991a2fa0bacc6baf3eb Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 20 Apr 2016 21:55:47 -0300 Subject: [PATCH 4/6] add support for grunt build --- server-ce/Dockerfile | 11 ++++++++-- server-ce/Gruntfile.coffee | 38 +++++++++++++++++++++++++++++++++ server-ce/git-revision.js | 22 +++++++++++++++++++ server-ce/package.json | 11 ++++++++++ server-ce/services.js | 43 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 server-ce/Gruntfile.coffee create mode 100644 server-ce/git-revision.js create mode 100644 server-ce/package.json create mode 100644 server-ce/services.js diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index ff52a33198..7d813bd5d5 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -14,15 +14,22 @@ RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharela # Install ShareLaTeX RUN apt-get install -y git python -RUN git clone -b release https://github.com/sharelatex/sharelatex.git /var/www/sharelatex -RUN cd /var/www/sharelatex && git pull origin release +RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex # zlib1g-dev is needed to compile the synctex binaries in the CLSI during `grunt install`. RUN apt-get install -y zlib1g-dev + +ADD services.js /var/www/sharelatex/config/services.js +ADD package.json /var/www/package.json +ADD git-revision.js /var/www/git-revision.js +RUN cd /var/www && npm install + RUN cd /var/www/sharelatex; \ npm install; \ grunt install; + +RUN cd /var/www && node git-revision > revisions.txt # Minify js assets RUN cd /var/www/sharelatex/web; \ diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee new file mode 100644 index 0000000000..0f1d222059 --- /dev/null +++ b/server-ce/Gruntfile.coffee @@ -0,0 +1,38 @@ +services = require('./services') + +module.exports = (grunt) -> + + tag = grunt.option("tag") or 'latest' + repos = [] + for service in services + url = service.repo.split('/') + owner = url[3] + repo = url[4].replace('.git','') + repos.push "/repos/#{owner}/#{repo}/git/refs/heads/#{service.version}" + + grunt.initConfig + docker_io: + default_options: + options: + dockerFileLocation: '.' + buildName: 'sharelatex' + tag: grunt.option('tag') or 'latest' + push: grunt.option('push') or false + force: true + + github: + combinedRevisions: + options: + #oAuth: + # access_token: '' + concat: true + src: repos + dest: 'version/' + tag + '.json' + + grunt.loadNpmTasks 'grunt-docker-io' + grunt.loadNpmTasks 'grunt-github-api' + + grunt.registerTask 'build', ['docker_io', 'github'] + grunt.registerTask 'gitrev', ['github'] + + grunt.registerTask 'default', ['build'] diff --git a/server-ce/git-revision.js b/server-ce/git-revision.js new file mode 100644 index 0000000000..89359cea2e --- /dev/null +++ b/server-ce/git-revision.js @@ -0,0 +1,22 @@ +var simple = require('simple-git'); +var services = require('./sharelatex/config/services'); +const fs = require('fs'); + +function print_latest(repoDir) { + git = simple(repoDir); + opt = []; + opt['max-count'] = 1; + git.log(opt, function(err, log) { + if (!err) { + console.log(repoDir + ',' + log.latest.hash); + } + }) +} + +for (id in services) { + service = services[id]; + dirPath = __dirname + '/sharelatex/'+service.name; + if (fs.existsSync(dirPath)) { + print_latest(dirPath); + } +} diff --git a/server-ce/package.json b/server-ce/package.json new file mode 100644 index 0000000000..329169d96d --- /dev/null +++ b/server-ce/package.json @@ -0,0 +1,11 @@ +{ + "name": "none", + "author": "none", + "description": "none", + "dependencies": { + "grunt": "^0.4.5", + "grunt-docker-io": "^0.7.0", + "simple-git": "^1.32.1", + "grunt-github-api": "^0.2.3" + } +} diff --git a/server-ce/services.js b/server-ce/services.js new file mode 100644 index 0000000000..be4da8698a --- /dev/null +++ b/server-ce/services.js @@ -0,0 +1,43 @@ +module.exports = + +[{ + name: "web", + repo: "https://github.com/sharelatex/web-sharelatex.git", + version: "master" +}, { + name: "real-time", + repo: "https://github.com/sharelatex/real-time-sharelatex.git", + version: "master" +}, { + name: "document-updater", + repo: "https://github.com/sharelatex/document-updater-sharelatex.git", + version: "master" +}, { + name: "clsi", + repo: "https://github.com/sharelatex/clsi-sharelatex.git", + version: "master" +}, { + name: "filestore", + repo: "https://github.com/sharelatex/filestore-sharelatex.git", + version: "master" +}, { + name: "track-changes", + repo: "https://github.com/sharelatex/track-changes-sharelatex.git", + version: "master" +}, { + name: "docstore", + repo: "https://github.com/sharelatex/docstore-sharelatex.git", + version: "master" +}, { + name: "chat", + repo: "https://github.com/sharelatex/chat-sharelatex.git", + version: "master" +}, { + name: "tags", + repo: "https://github.com/sharelatex/tags-sharelatex.git", + version: "master" +}, { + name: "spelling", + repo: "https://github.com/sharelatex/spelling-sharelatex.git", + version: "master" +}] From 9ae564b1051e18e9999e2953bbf15468e8c1563b Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Mon, 2 May 2016 23:55:53 +0000 Subject: [PATCH 5/6] add baseDir for Dockerfile --- server-ce/Dockerfile | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index 7d813bd5d5..2f9766efaa 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -1,5 +1,7 @@ FROM phusion/baseimage:0.9.16 +ENV baseDir . + # Install Node.js and Grunt RUN curl -sL https://deb.nodesource.com/setup | sudo bash - RUN apt-get install -y build-essential nodejs @@ -20,9 +22,9 @@ RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex RUN apt-get install -y zlib1g-dev -ADD services.js /var/www/sharelatex/config/services.js -ADD package.json /var/www/package.json -ADD git-revision.js /var/www/git-revision.js +ADD ${baseDir}/services.js /var/www/sharelatex/config/services.js +ADD ${baseDir}/package.json /var/www/package.json +ADD ${baseDir}/git-revision.js /var/www/git-revision.js RUN cd /var/www && npm install RUN cd /var/www/sharelatex; \ @@ -39,11 +41,11 @@ RUN cd /var/www/sharelatex/web; \ run apt-get update RUN apt-get install -y nginx; RUN rm /etc/nginx/sites-enabled/default -ADD nginx/nginx.conf /etc/nginx/nginx.conf -ADD nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf +ADD ${baseDir}/nginx/nginx.conf /etc/nginx/nginx.conf +ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf RUN mkdir /etc/service/nginx -ADD runit/nginx.sh /etc/service/nginx/run +ADD ${baseDir}/runit/nginx.sh /etc/service/nginx/run # Set up ShareLaTeX services to run automatically on boot RUN mkdir /etc/service/chat-sharelatex; \ @@ -57,16 +59,16 @@ RUN mkdir /etc/service/chat-sharelatex; \ mkdir /etc/service/track-changes-sharelatex; \ mkdir /etc/service/web-sharelatex; -ADD runit/chat-sharelatex.sh /etc/service/chat-sharelatex/run -ADD runit/clsi-sharelatex.sh /etc/service/clsi-sharelatex/run -ADD runit/docstore-sharelatex.sh /etc/service/docstore-sharelatex/run -ADD runit/document-updater-sharelatex.sh /etc/service/document-updater-sharelatex/run -ADD runit/filestore-sharelatex.sh /etc/service/filestore-sharelatex/run -ADD runit/real-time-sharelatex.sh /etc/service/real-time-sharelatex/run -ADD runit/spelling-sharelatex.sh /etc/service/spelling-sharelatex/run -ADD runit/tags-sharelatex.sh /etc/service/tags-sharelatex/run -ADD runit/track-changes-sharelatex.sh /etc/service/track-changes-sharelatex/run -ADD runit/web-sharelatex.sh /etc/service/web-sharelatex/run +ADD ${baseDir}/runit/chat-sharelatex.sh /etc/service/chat-sharelatex/run +ADD ${baseDir}/runit/clsi-sharelatex.sh /etc/service/clsi-sharelatex/run +ADD ${baseDir}/runit/docstore-sharelatex.sh /etc/service/docstore-sharelatex/run +ADD ${baseDir}/runit/document-updater-sharelatex.sh /etc/service/document-updater-sharelatex/run +ADD ${baseDir}/runit/filestore-sharelatex.sh /etc/service/filestore-sharelatex/run +ADD ${baseDir}/runit/real-time-sharelatex.sh /etc/service/real-time-sharelatex/run +ADD ${baseDir}/runit/spelling-sharelatex.sh /etc/service/spelling-sharelatex/run +ADD ${baseDir}/runit/tags-sharelatex.sh /etc/service/tags-sharelatex/run +ADD ${baseDir}/runit/track-changes-sharelatex.sh /etc/service/track-changes-sharelatex/run +ADD ${baseDir}/runit/web-sharelatex.sh /etc/service/web-sharelatex/run # Install TexLive RUN apt-get install -y wget @@ -93,14 +95,14 @@ RUN apt-get install -y unzip RUN apt-get install -y imagemagick optipng # phusion/baseimage init script -ADD 00_regen_sharelatex_secrets.sh /etc/my_init.d/00_regen_sharelatex_secrets.sh -ADD 00_make_sharelatex_data_dirs.sh /etc/my_init.d/00_make_sharelatex_data_dirs.sh -ADD 00_set_docker_host_ipaddress.sh /etc/my_init.d/00_set_docker_host_ipaddress.sh -ADD 99_migrate.sh /etc/my_init.d/99_migrate.sh +ADD ${baseDir}/00_regen_sharelatex_secrets.sh /etc/my_init.d/00_regen_sharelatex_secrets.sh +ADD ${baseDir}/00_make_sharelatex_data_dirs.sh /etc/my_init.d/00_make_sharelatex_data_dirs.sh +ADD ${baseDir}/00_set_docker_host_ipaddress.sh /etc/my_init.d/00_set_docker_host_ipaddress.sh +ADD ${baseDir}/99_migrate.sh /etc/my_init.d/99_migrate.sh # Install ShareLaTeX settings file RUN mkdir /etc/sharelatex -ADD settings.coffee /etc/sharelatex/settings.coffee +ADD ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee EXPOSE 80 From b4f2eeec7fa882e35c8402d48e2378e0e54eebd4 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 9 May 2016 16:08:51 +0100 Subject: [PATCH 6/6] recommend debian/ubuntu --- server-ce/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server-ce/README.md b/server-ce/README.md index e1a0c228b3..5d6956d7f6 100644 --- a/server-ce/README.md +++ b/server-ce/README.md @@ -34,6 +34,9 @@ If you want to permanently remove ShareLaTeX from your docker containers: docker rm sharelatex ``` +### Operating systems +We recommend a debian based operating system such as Ubuntu for ShareLaTeX, this is what the software has been developed using and most people use when running ShareLaTeX. + ### Mongo and Redis ShareLaTeX depends on [MongoDB](http://www.mongodb.org/) (must be 2.4 or later, 3.x is recommended), and