Commit 634ae11b authored by Mickael BARON's avatar Mickael BARON
Browse files

Fix the texlive scheme-full problem and a workaround for building document-update service

parent b830a7d8

Dockerfile

+7 −3
Original line number Diff line number Diff line
@@ -28,7 +28,12 @@ RUN cd /var/www && npm install 


RUN cd /var/www/sharelatex; \

	npm install; \

	grunt install; \

	grunt install;



# Fix document-update build problem. Gruntfile.coffee was missing.

COPY ${baseDir}/fix/Gruntfile.coffee /var/www/sharelatex/document-updater/Gruntfile.coffee



RUN cd /var/www/sharelatex; \ 

	bash -c 'source ./bin/install-services'; \

	cd web; \

	npm install; \
@@ -52,4 +57,3 @@ EXPOSE 80 
WORKDIR /



ENTRYPOINT ["/sbin/my_init"]

Dockerfile-base

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ RUN echo "selected_scheme scheme-basic" >> /install-tl-unx/texlive.profile; \ 
RUN rm -r /install-tl-unx; \

	rm install-tl-unx.tar.gz



ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2017/bin/x86_64-linux/

RUN tlmgr install latexmk

ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2018/bin/x86_64-linux/

RUN tlmgr install scheme-full

RUN tlmgr install texcount



RUN npm install -g grunt-cli

fix/Gruntfile.coffee

0 → 100644
+137 −0
Original line number Diff line number Diff line 
module.exports = (grunt) ->

	grunt.initConfig

		forever:

			app:

				options:

					index: "app.js"



		execute:

			app:

				src: "app.js"



		bunyan:

			strict: false



		coffee:

			app_dir:

				expand: true,

				flatten: false,

				cwd: 'app/coffee',

				src: ['**/*.coffee'],

				dest: 'app/js/',

				ext: '.js'



			app:

				src: 'app.coffee'

				dest: 'app.js'



			acceptance_tests:

				expand: true,

				flatten: false,

				cwd: 'test/acceptance/coffee',

				src: ['**/*.coffee'],

				dest: 'test/acceptance/js/',

				ext: '.js'



			unit_tests:

				expand: true,

				flatten: false,

				cwd: 'test/unit/coffee',

				src: ['**/*.coffee'],

				dest: 'test/unit/js/',

				ext: '.js'



		clean:

			app: ["app/js"]

			acceptance_tests: ["test/acceptance/js"]

			unit_tests: ["test/unit/js"]



		mochaTest:

			unit:

				src: ["test/unit/js/#{grunt.option('feature') or '**'}/*.js"]

				options:

					reporter: grunt.option('reporter') or 'spec'

					grep: grunt.option("grep")

			acceptance:

				src: ["test/acceptance/js/#{grunt.option('feature') or '*'}.js"]

				options:

					reporter: grunt.option('reporter') or 'spec'

					grep: grunt.option("grep")

					timeout: 50000



		shell:

			fullAcceptanceTests:

				command: "bash ./test/acceptance/scripts/full-test.sh"

			dockerTests:

				command: 'docker run -v "$(pwd):/app" --rm sl-acceptance-test-runner'



		availabletasks:

			tasks:

				options:

		            filter: 'exclude',

		            tasks: [

		            	'coffee'

		            	'clean'

		            	'mochaTest'

		            	'availabletasks'

		            	'execute'

		            	'bunyan'

		           	]

		            groups:

		            	"Compile tasks": [

		            		"compile:server"

		            		"compile:tests"

		            		"compile"

		            		"compile:unit_tests"

		            		"compile:acceptance_tests"

		            		"install"

		            	]

		            	"Test tasks": [

		            		"test:unit"

		            		"test:acceptance"

		            	]

		            	"Run tasks": [

		            		"run"

		            		"default"

		            	]

		            	"Misc": [

		            		"help"

		            	]



	grunt.loadNpmTasks 'grunt-contrib-coffee'

	grunt.loadNpmTasks 'grunt-contrib-clean'

	grunt.loadNpmTasks 'grunt-mocha-test'

	grunt.loadNpmTasks 'grunt-available-tasks'

	grunt.loadNpmTasks 'grunt-execute'

	grunt.loadNpmTasks 'grunt-bunyan'

	grunt.loadNpmTasks 'grunt-forever'

	grunt.loadNpmTasks 'grunt-shell'



	grunt.registerTask 'help', 'Display this help list', 'availabletasks'



	grunt.registerTask 'compile:server', 'Compile the server side coffee script', ['clean:app', 'coffee:app', 'coffee:app_dir']

	grunt.registerTask 'compile:unit_tests', 'Compile the unit tests', ['clean:unit_tests', 'coffee:unit_tests']

	grunt.registerTask 'compile:acceptance_tests', 'Compile the acceptance tests', ['clean:acceptance_tests', 'coffee:acceptance_tests']

	grunt.registerTask 'compile:tests', 'Compile all the tests', ['compile:acceptance_tests', 'compile:unit_tests']

	grunt.registerTask 'compile', 'Compiles everything need to run document-updater-sharelatex', ['compile:server']



	grunt.registerTask 'install', "Compile everything when installing as an npm module", ['compile']



	grunt.registerTask 'test:unit', 'Run the unit tests (use --grep=<regex> for individual tests)', ['compile:server', 'compile:unit_tests', 'mochaTest:unit']



	grunt.registerTask(

		'test:acceptance:full',

		"Start server and run acceptance tests",

		['shell:fullAcceptanceTests']

	)



	grunt.registerTask(

		'test:acceptance:docker',

		"Run acceptance tests inside docker container",

		['shell:dockerTests']

	)



	grunt.registerTask 'test:acceptance', 'Run the acceptance tests (use --grep=<regex> for individual tests)', ['compile:acceptance_tests', 'mochaTest:acceptance']



	grunt.registerTask 'run', "Compile and run the document-updater-sharelatex server", ['compile', 'bunyan', 'execute']

	grunt.registerTask 'default', 'run'