move

packer/desktop-environment.json

@@ -17,11 +17,11 @@
         "# Install git",
         "apt-get update -qq && apt-get install -qq git",
 
-        "# Clone the desktop environment repository",
+        "# Clone the desktop environment",
         "git clone https://github.com/{{user `DESKTOP_ENVIRONMENT_REGISTRY`}}/{{user `DESKTOP_ENVIRONMENT_CONTAINER`}}",
 
-        "# Bootstrap the host",
-        "{{user `DESKTOP_ENVIRONMENT_HOST_REPOSITORY`}}/host/bootstrap.sh"
+        "# Start the desktop environment",
+        "{{user `DESKTOP_ENVIRONMENT_ENVIRONMENT_CONTAINER`}}/host/bootstrap.sh"
       ]
     }
   ]

packer/scripts/build.sh

@@ -1,4 +1,4 @@
-REPO_ROOT=$(dirname $(realpath $0))/..
+REPO_ROOT=$(dirname $(realpath $0))/../..
 
 # Export desktop environment shell configuration
 export $($REPO_ROOT/docker/scripts/environment.sh)
@@ -11,11 +11,9 @@ docker run \
   --interactive \
   --rm \
   --tty \
-  --volume $DESKTOP_ENVIRONMENT_HOST_REPOSITORY:$DESKTOP_ENVIRONMENT_HOST_REPOSITORY \
-  --workdir $DESKTOP_ENVIRONMENT_HOST_REPOSITORY \
+  --volume $DESKTOP_ENVIRONMENT_HOST_REPOSITORY:$DESKTOP_ENVIRONMENT_HOST_REPOSITORY:ro \
   hashicorp/packer:light build \
   -force \
   -var DESKTOP_ENVIRONMENT_CONTAINER=$DESKTOP_ENVIRONMENT_CONTAINER \
   -var DESKTOP_ENVIRONMENT_REGISTRY=$DESKTOP_ENVIRONMENT_REGISTRY \
-  -var DESKTOP_ENVIRONMENT_USER=$DESKTOP_ENVIRONMENT_USER \
-  packer/desktop-environment.json
+  $DESKTOP_ENVIRONMENT_HOST_REPOSITORY:packer/desktop-environment.json