Makefile

@@ -1,37 +1,6 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# SPDX-FileCopyrightText: 2023 Glenn Y. Rolland <glenux@glenux.net>
-# Copyright © 2023 Glenn Y. Rolland <glenux@glenux.net>
-
-CURRENT_UID := $(shell id -u)
-CURRENT_GID := $(shell id -g)
-ifeq ($(CURRENT_UID),0)
-PREFIX=/usr
-else
-PREFIX=$(HOME)/.local
-endif
 
 
 all: build
 
-prepare:
-		shards install
-
 build:
-		shards build --error-trace -Dpreview_mt
+	shards build --error-trace
-		@echo SUCCESS
-
-watch: 
-		 watchexec --restart --delay-run 3 -c -e cr make build
-
-spec: test
-test:
-		crystal spec --error-trace
-
-install:
-		install \
-				-m 755 \
-				bin/docmachine \
-				$(PREFIX)/bin
-
-.PHONY: spec test build all prepare install

src/build/cli.cr

@@ -20,10 +20,6 @@ module DocMachine::Build
           config.action = action
         end
 
-        opts.on("--no-cache", "Disable cache") do |_|
-          config.enable_cache = false
-        end
-
         opts.on("-d", "--data-dir DIR", "Content directory") do |dir|
           config.data_dir = dir
         end
@@ -33,7 +29,7 @@ module DocMachine::Build
         end
 
         opts.on("-m", "--multiple", "Allow multiple instances per dir" ) do |port|
-          config.enable_multiple = true
+          config.multiple_instances = true
         end
 
         opts.on("-t", "--tty", "Enable TTY mode (needed for shell)") do

src/build/config.cr

@@ -5,8 +5,7 @@ module DocMachine::Build
     property action : String = "watch"
     property enable_tty : Bool = false
     property port : Int32 = 5100
-    property enable_multiple : Bool = false
+    property multiple_instances : Bool = false
-    property enable_cache : Bool = false
 
     def initialize(@parent : DocMachine::Config)
     end

src/build/run.cr

@@ -29,7 +29,7 @@ module DocMachine::Build
       Log.info { "action       = #{@config.action}" }
 
       self._pull_image()
-      self._avoid_duplicates() unless @config.enable_multiple
+      self._avoid_duplicates() unless @config.multiple_instances
     end
 
     private def _find_port(port_base)
@@ -68,7 +68,6 @@ module DocMachine::Build
                        else Path[ENV["HOME"], ".cache", "docmachine"]
                        end
 
-      ## Build cache if it doesnt exist
       data_cache_file = data_cache_dir  / "image.tar"
       Log.info { "Checking cache #{data_cache_file}..." }
       if ! File.exists? data_cache_file.to_s
@@ -92,23 +91,18 @@ module DocMachine::Build
         Log.info { "Cache already exist. Skipping." }
       end
 
-      if @config.enable_cache
+      Log.info { "Loading #{@docker_image} image from cache..." }
-        Log.info { "Loading #{@docker_image} image from cache..." }
+      docker_image_loaded = false
-        docker_image_loaded = false
+      status = Process.run(
-        status = Process.run(
+        "docker", 
-          "docker", 
+        ["image", "load", "-i", data_cache_file.to_s], 
-          ["image", "load", "-i", data_cache_file.to_s], 
+        output: STDOUT
-          output: STDOUT
+      )
-        )
+      if status.success? 
-        if status.success? 
+        Log.info { "done" }
-          Log.info { "done" }
-        else
-          Log.error { "Unable to load cache image" }
-          exit 1
-        end
       else
-        Log.info { "Loading #{@docker_image} image from local registry..." }
+        Log.error { "Unable to load cache image" }
-        # FIXME: check that local image exists
+        exit 1
       end
     end