Remove Vagrant, cleanup build

Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-MAINTAINER Lee Keitel <lfkeitel@usi.edu>
+LABEL maintainer=Lee Keitel <lfkeitel@usi.edu>
 
 ARG IMG_VERSION
 ENV IMG_VERSION ${IMG_VERSION:-none}
@@ -70,11 +70,11 @@ COPY public/dist /usr/src/dandelion/public
 COPY vendor /usr/src/dandelion/vendor
 COPY config/config.sample.php /usr/src/dandelion/config/config.sample.php
 COPY config/config.defaults.php /usr/src/dandelion/config/config.defaults.php
-COPY docker/docker-entrypoint.sh /usr/local/bin/
+COPY docker/docker-entrypoint.sh /
 
 WORKDIR /var/www/dandelion
 EXPOSE 80
 VOLUME /var/www/dandelion
 
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/usr/sbin/httpd", "-DFOREGROUND", "-f", "/etc/apache2/httpd.conf"]

dev-tools.sh

@@ -59,13 +59,22 @@ buildDandelion()
         'dev-tools.sh'
         'Vagrantfile'
         'server.php'
+        'docker'
+        '.env'
+        '.git*'
+        'docker-compose.yml'
+        'Dockerfile'
+        'package-lock.json'
     )
 
     for DIR in "${DEV_ITEMS[@]}"; do
         echo "Deleting $FULL_DIR/$DIR"
         rm -rf $FULL_DIR/$DIR
     done
 
+    mv -f $FULL_DIR/public/dist/* $FULL_DIR/public/
+    rm -rf $FULL_DIR/public/dist
+
     echo "Creating tarball"
     cd $TMP_DIR
     tar czf $DELIVERY_DIR/dandelion-$GIT_BRANCH_FILENAME.tar.gz $GIT_DIR/
@@ -119,7 +128,7 @@ buildCommand ()
                 ;;
             -p)
                 shift
-                MV_PATH="$1"
+                MV_PATH="$(realpath $1)"
                 shift
         esac
     done