Add support for Docker

Dockerfile

@@ -0,0 +1,18 @@
+FROM node:12.16.2-buster-slim
+
+EXPOSE 80
+EXPOSE 443
+
+RUN apt-get update && apt-get -y install git libnss3-tools
+
+RUN git clone https://github.com/alfonsomunozpomer/site.js.git
+WORKDIR /site.js
+RUN git checkout docker
+RUN npm install && npm install [email protected] --save-dev
+RUN npm run build && cp dist/release/linux/`ls -1t dist/release/linux | head -1`/site /usr/local/bin
+
+VOLUME /site.js/dist
+VOLUME /var/www/html
+
+ENTRYPOINT ["site"]
+CMD ["serve", "/var/www/html", "--docker"]

bin/commands/serve.js

@@ -20,6 +20,7 @@ const SYNC_TO = 'sync-to'
 const SYNC_FROM = 'sync-from'
 const LIVE_SYNC = 'live-sync'
 const SYNC_FOLDER_AND_CONTENTS = 'sync-folder-and-contents'
+const DOCKER = 'docker'
 
 // This will only show errors in the access log (HTTP response codes 4xx and 5xx).
 const ACCESS_LOG_ERRORS_ONLY = 'access-log-errors-only'
@@ -145,6 +146,9 @@ function serve (args) {
   const syncRequested = args.named[SYNC_TO] !== undefined
   const liveSync = args.named[LIVE_SYNC]
 
+  // Is Site.js running in a Docker container?
+  const docker = args.named[DOCKER]
+
   //
   // Handle initial sync setup-related tasks.
   //
@@ -186,7 +190,7 @@ function serve (args) {
 
   // Ensure privileged ports are disabled on Linux machines.
   // For details, see: https://source.small-tech.org/site.js/app/-/issues/169
-  ensure.privilegedPortsAreDisabled()
+  ensure.privilegedPortsAreDisabled(docker)
 
   // Start a server and also sync if requested.
   tcpPortUsed.check(port)

bin/lib/Help.js

@@ -82,6 +82,8 @@ class Help {
     const optionAccessLogErrorsOnly = option('access-log-errors-only')
     const optionAccessLogDisable = option('access-log-disable')
 
+    const optionDocker = option('docker')
+
     // Black right-pointing triangle (U+25B6)
     // (There are several similar unicode gylphs but this is the one that works well across
     // Linux, macOS, and Windows).
@@ -150,6 +152,7 @@ class Help {
     ${optionSyncFrom}\t\t\t\tThe folder to sync from.
     ${optionLiveSync}\t\t\t\tWatch for changes and live sync them to a remote server.
     ${optionSyncFolderAndContents}\t\tSync local folder and contents (default is to sync the folder’s contents only).
+    ${optionDocker}\t\t\t\tSet when running in a Docker container (does not disable privileged ports).
 
     ${ this.systemdExists ? `For ${commandEnable} command:
 

bin/lib/ensure.js

@@ -122,8 +122,8 @@ class Ensure {
   // execute, we carry it out every time.
   //
   // For more details, see: https://source.small-tech.org/site.js/app/-/issues/169
-  privilegedPortsAreDisabled () {
-    if (os.platform() === 'linux') {
+  privilegedPortsAreDisabled (docker) {
+    if (os.platform() === 'linux' && !docker) {
       try {
         Site.logAppNameAndVersion()
 

index.js

@@ -171,10 +171,10 @@ class Site {
         default:
           return [
             siteJSBlue('███████ ██ ████████ ███████         ██ ███████'),
-            siteJSBlue('         ██      ██    ██    ██              ██ ██     '),
-            siteJSBlue('         ███████ ██    ██    █████           ██ ███████'),
-            siteJSBlue('              ██ ██    ██    ██         ██   ██      ██'),
-            siteJSBlue('         ███████ ██    ██    ███████ ██  █████  ███████'),
+            `         ${siteJSBlue('██      ██    ██    ██              ██ ██     ')}`,
+            `         ${siteJSBlue('███████ ██    ██    █████           ██ ███████')}`,
+            `         ${siteJSBlue('     ██ ██    ██    ██         ██   ██      ██')}`,
+            `         ${siteJSBlue('███████ ██    ██    ███████ ██  █████  ███████')}`,
             '\n'
           ]
     }