fix: revert docker changes, as they fail on build

Author: etabakov

build/.dockerignore

@@ -1,3 +1,2 @@
 *
-!Gemfile
-!docs-watcher/start.sh
+!docs-watcher/start.sh

build/Dockerfile

@@ -1,9 +1,6 @@
 FROM ruby:2.3.5-alpine3.4
 
-RUN mkdir /www
-
 COPY docs-watcher/start.sh /
-COPY Gemfile /www/
 
 RUN apk add --update \
   bash \
@@ -15,24 +12,11 @@ RUN apk add --update \
   rsync \
   nginx \
   nodejs \
-  && rm -rf /var/cache/apk/*
-
-RUN npm config set cache /var --global \
+  && rm -rf /var/cache/apk/* \
+  && npm config set cache /var --global \
   && npm install -g grunt \
   && mkdir /run/nginx \
-  && chmod +x /start.sh \
-  && echo "Symlinking folders..." \
-  && ln -s /root/docs /www/docs \
-  && ln -s /root/NativeScript /www/NativeScript \
-  && ln -s /root/nativescript-angular /www/nativescript-angular \
-  && ln -s /root/nativescript-sdk-examples-ng /www/nativescript-sdk-examples-ng \
-  && ln -s /root/nativescript-sdk-examples-js /www/nativescript-sdk-examples-js \
-  && ln -s /root/sidekick-docs /www/sidekick-docs \
-  && ln -s /root/nativescript-cli /www/nativescript-cli
-
-RUN cd /www \
-  && bundle install \
-  && bundle config build.nokogiri --use-system-libraries
+  && chmod +x /start.sh
 
 ENTRYPOINT [ "/start.sh" ]
 

build/Gemfile

@@ -7,4 +7,3 @@ gem 'jekyll-assets'
 gem 'github-markdown'
 gem 'html-pipeline'
 gem 'jekyll-unsanitize', '0.4'
-gem 'commonmarker'

build/build-docs.sh

@@ -32,16 +32,18 @@ if [ ! -d "$WWW_ROOT" ]; then
 	mkdir $WWW_ROOT
 fi
 
+bundle config build.nokogiri --use-system-libraries
+
 cd $CLI_ROOT
 ./docs/build-jekyll-md.sh
 
 cd $SIDEKICK_ROOT
+bundle install
 jekyll build --config _config.yml
 
 cd $SCRIPT_PATH
 
 cp -r $SCRIPT_PATH"/_config_vuejs.yml" \
-	  $SCRIPT_PATH"/fonts" \
 	  $SCRIPT_PATH"/_assets" \
 	  $SCRIPT_PATH"/_layouts" \
 	  $SCRIPT_PATH"/_plugins" \
@@ -108,4 +110,4 @@ cp -R $MODULES_ROOT"/bin/dist/api-reference" \
 	  $WWW_ROOT
 
 cp -R $NS_DIST_ROOT"/./" $WWW_ROOT
-cp -R $NG_DIST_ROOT"/./" $WWW_ROOT"/angular"
+cp -R $NG_DIST_ROOT"/./" $WWW_ROOT"/angular"

build/docs-watcher/start.sh

@@ -23,6 +23,18 @@ sigint_handler() {
 trap 'kill ${!}; sigterm_handler' SIGTERM
 trap 'sigint_handler' SIGINT
 
+mkdir /www
+echo "Start copying mounted folders..."
+rsync --relative -az --exclude node_modules/ \
+	/root/./docs \
+	/root/./NativeScript \
+	/root/./nativescript-angular \
+	/root/./nativescript-sdk-examples-ng \
+	/root/./nativescript-sdk-examples-js \
+	/root/./sidekick-docs \
+	/root/./nativescript-cli \
+	/www
+
 /www/docs/build/build-docs.sh
 /www/docs/build/nginx-setup.sh
 
@@ -33,4 +45,4 @@ node index.js & PID="$!"
 while true
 do
 	tail -f /dev/null & wait ${!}
-done
+done

build/docs-watcher/watchers.js

@@ -177,19 +177,12 @@ module.exports.SourcesWatcher = class SourcesWatcher {
 		var filename = path.basename(f);
 		if (filename == "_config.yml" || filename == "_config_nativescript.yml" || filename == "_config_angular.yml") {
 			console.log(`${f} updated -> restarting jekyll service...`);
-			var destination;
-
 			if (f.toLowerCase().indexOf("sidekick-docs") < 0) {
-				destination = path.join(paths.binRoot, filename);
+				fs.copySync(f, path.join(paths.binRoot, filename));
 			} else {
-				destination = path.join(paths.sidekickRoot, filename);
+				fs.copySync(f, path.join(paths.sidekickRoot, filename));
 			}
-
-			if (f !== destination) {
-                fs.copySync(f, destination);
-                this.jekyllService.restart();
-            }
-
+			this.jekyllService.restart();
 			return;
 		}
 
@@ -201,8 +194,8 @@ module.exports.SourcesWatcher = class SourcesWatcher {
 			if (f.toLowerCase().indexOf("sidekick-docs") > -1) {
 				destination = path.join(paths.sidekickRoot, relativePath);
 			}
-``
-			if (fs.existsSync(f) && f !== destination) {
+
+			if (fs.existsSync(f)) {
 				console.log(`${destination} updated -> rebuilding site...`);
 				ensureDestPath(destination);
 				fs.copySync(f, destination);
@@ -214,7 +207,7 @@ module.exports.SourcesWatcher = class SourcesWatcher {
 		var relativePath = path.relative(paths.sourceFilesRoot, f);
 		var destFile = path.join(paths.wwwRoot, relativePath);
 
-		if (fs.existsSync(f) && f !== destFile) {
+		if (fs.existsSync(f)) {
 			ensureDestPath(destFile);
 			fs.copySync(f, destFile);
 			console.log(`${destFile} updated -> rebuilding site...`);
@@ -268,4 +261,4 @@ function ensureDestPath(filename) {
 	if (!fs.existsSync(folder)) {
 		fs.ensureDirSync(folder);
 	}
-}
+}