From 8b8dbb588c4670dcb5817de75800024ca62830f3 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 15 Jun 2016 17:08:21 +0100 Subject: [PATCH] remove grunfile and circule.yml file, consolodate in server pro --- server-ce/Gruntfile.coffee | 45 -------------------------------------- server-ce/README.md | 6 +---- server-ce/circle.yml | 13 ----------- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 server-ce/Gruntfile.coffee delete mode 100644 server-ce/circle.yml diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee deleted file mode 100644 index 502fc13c36..0000000000 --- a/server-ce/Gruntfile.coffee +++ /dev/null @@ -1,45 +0,0 @@ -services = require('./services') - -module.exports = (grunt) -> - - tag = grunt.option("tag") or 'latest' - to = grunt.option("to") 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: 'versions/' + tag + '.json' - - rename: - main: - files: [{ src: ['versions/latest.json'], dest: 'versions/' + to + '.json'}] - - grunt.loadNpmTasks 'grunt-docker-io' - grunt.loadNpmTasks 'grunt-github-api' - grunt.loadNpmTasks 'grunt-contrib-rename' - - grunt.registerTask 'build', ['docker_io', 'github'] - grunt.registerTask 'gitrev', ['github'] - grunt.registerTask 'cut', ['rename'] - - grunt.registerTask 'default', ['build'] diff --git a/server-ce/README.md b/server-ce/README.md index 04a117bcb7..8e5cd84b8e 100644 --- a/server-ce/README.md +++ b/server-ce/README.md @@ -1,6 +1,2 @@ ## Install -Please see the [offical wiki for install guides](https://github.com/sharelatex/sharelatex/wiki/Production-Installation-Instructions) - -## Building image - -The docker files can be built with grunt. We do this as there are some other tasks which are done using grunt such as marking the versions of each repo used. +Please see the [offical wiki for install guides](https://github.com/sharelatex/sharelatex/wiki/Production-Installation-Instructions) \ No newline at end of file diff --git a/server-ce/circle.yml b/server-ce/circle.yml deleted file mode 100644 index 6df3bd992e..0000000000 --- a/server-ce/circle.yml +++ /dev/null @@ -1,13 +0,0 @@ -# circle.yml -machine: - services: - - docker - -dependencies: - pre: - - grunt - -test: - post: - - docker run -d -v --name=sharelatex -p 5000:80 -; sleep 20 - - curl --retry 10 --retry-delay 5 -v http://localhost:5000/status