no longer need top-level docker dir, assets all moved elsewhere

Dockerfile

@@ -54,9 +54,9 @@ RUN mkdir /bubble
 COPY bin/install_packer.sh /usr/local/bin/
 RUN /usr/local/bin/install_packer.sh
 
-# Install API jar and env file. Make sure we get the regular jar and not the full jar
-COPY bubble-server/target/bubble-server-*-SNAPSHOT.jar /bubble/bubble.jar
-COPY docker/bubble.env /bubble/bubble.env
+# Install API jar, touch env file. Make sure we get the regular jar and not the full jar
+COPY bubble-server/target/bubble-server-*-prod.jar /bubble/bubble.jar
+RUN touch /bubble/bubble.env
 
 # Setup Bubble service
 RUN mkdir /etc/service/bubble

Dockerfile.slim

@@ -54,9 +54,9 @@ RUN mkdir /bubble
 COPY bin/install_packer.sh /usr/local/bin/
 #RUN /usr/local/bin/install_packer.sh
 
-# Install env file only
-#COPY bubble-server/target/bubble-server-*-SNAPSHOT.jar /bubble/bubble.jar
-COPY docker/bubble.env /bubble/bubble.env
+# Touch env file only
+#COPY bubble-server/target/bubble-server-*-prod.jar /bubble/bubble.jar
+RUN touch /bubble/bubble.env
 
 # Setup Bubble service
 RUN mkdir /etc/service/bubble

docker/bubble.sh → bin/bdocker

@@ -4,7 +4,7 @@
 #
 # Build, run or push a docker container for a Bubble launcher. Intended for developer use.
 #
-#      bubble.sh [mode] [version]
+#      bdocker [mode] [version]
 #
 #  mode : build, run or push
 #      build - build the docker images

bubble-server/pom.xml

@@ -386,6 +386,7 @@
         <profile>
             <id>production</id>
             <build>
+                <finalName>bubble-server-${project.version}-prod.jar</finalName>
                 <resources>
                     <resource>
                         <directory>src/main/resources</directory>

docs/docker-launcher.md

@@ -6,7 +6,7 @@ The Bubble Docker Launcher makes it easy to run a Bubble launcher.
 If you're running Linux or Mac OS X, try the automatic setup script first.
 This script will automatically install docker, pull the Bubble docker image and run it.
 
-    /bin/bash -c "$(curl -sL https://git.bubblev.org/bubblev/bubble/raw/branch/master/docker/launcher.sh)"
+    /bin/bash -c "$(curl -sL https://git.bubblev.org/bubblev/bubble/raw/branch/master/launcher.sh)"
 
 ## Docker Installation
 If you're running Windows, or if the above script has problems installing Docker,

docker/launcher.sh → launcher.sh

@@ -4,7 +4,9 @@
 #
 # Run bubble launcher in a docker container. Works on Linux or Mac OS.
 #
-#   /bin/bash -c "$(curl -sL https://git.bubblev.org/bubblev/bubble/raw/branch/master/docker/launcher.sh)"
+# Intended to be "run from anywhere" like this:
+#
+#   /bin/bash -c "$(curl -sL https://git.bubblev.org/bubblev/bubble/raw/branch/master/launcher.sh)"
 #
 # This command will:
 #   - install docker if no "docker" command found