organize the docker directory
diff --git a/docker/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7
similarity index 93%
rename from docker/Dockerfile.centos7
rename to docker/compile/Dockerfile.centos7
index 7044fe5..e83456d 100644
--- a/docker/Dockerfile.centos7
+++ b/docker/compile/Dockerfile.centos7
@@ -37,4 +37,4 @@
&& /tmp/bazel.sh
ADD bazelrc /root/.bazelrc
-ADD compile-platform.sh /compile-platform.sh
+ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/Dockerfile.ubuntu14.04 b/docker/compile/Dockerfile.ubuntu14.04
similarity index 93%
rename from docker/Dockerfile.ubuntu14.04
rename to docker/compile/Dockerfile.ubuntu14.04
index 0c19c53..a1bd885 100644
--- a/docker/Dockerfile.ubuntu14.04
+++ b/docker/compile/Dockerfile.ubuntu14.04
@@ -32,4 +32,4 @@
&& /tmp/bazel.sh
ADD bazelrc /root/.bazelrc
-ADD compile-platform.sh /compile-platform.sh
+ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/Dockerfile.ubuntu15.10 b/docker/compile/Dockerfile.ubuntu15.10
similarity index 93%
rename from docker/Dockerfile.ubuntu15.10
rename to docker/compile/Dockerfile.ubuntu15.10
index 8ff213c..b7cd58a 100644
--- a/docker/Dockerfile.ubuntu15.10
+++ b/docker/compile/Dockerfile.ubuntu15.10
@@ -31,4 +31,4 @@
&& /tmp/bazel.sh
ADD bazelrc /root/.bazelrc
-ADD compile-platform.sh /compile-platform.sh
+ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/Dockerfile.ubuntu16.04 b/docker/compile/Dockerfile.ubuntu16.04
similarity index 93%
rename from docker/Dockerfile.ubuntu16.04
rename to docker/compile/Dockerfile.ubuntu16.04
index ab8d1fb..4823104 100644
--- a/docker/Dockerfile.ubuntu16.04
+++ b/docker/compile/Dockerfile.ubuntu16.04
@@ -32,5 +32,5 @@
&& /tmp/bazel.sh
ADD bazelrc /root/.bazelrc
-ADD compile-platform.sh /compile-platform.sh
+ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7
similarity index 100%
rename from docker/Dockerfile.dist.centos7
rename to docker/dist/Dockerfile.dist.centos7
diff --git a/docker/Dockerfile.dist.ubuntu14.04 b/docker/dist/Dockerfile.dist.ubuntu14.04
similarity index 100%
rename from docker/Dockerfile.dist.ubuntu14.04
rename to docker/dist/Dockerfile.dist.ubuntu14.04
diff --git a/docker/Dockerfile.dist.ubuntu15.10 b/docker/dist/Dockerfile.dist.ubuntu15.10
similarity index 100%
rename from docker/Dockerfile.dist.ubuntu15.10
rename to docker/dist/Dockerfile.dist.ubuntu15.10
diff --git a/docker/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04
similarity index 100%
rename from docker/Dockerfile.dist.ubuntu16.04
rename to docker/dist/Dockerfile.dist.ubuntu16.04
diff --git a/docker/build-artifacts.sh b/docker/scripts/build-artifacts.sh
similarity index 94%
rename from docker/build-artifacts.sh
rename to docker/scripts/build-artifacts.sh
index df53a6d..6837a03 100755
--- a/docker/build-artifacts.sh
+++ b/docker/scripts/build-artifacts.sh
@@ -5,8 +5,8 @@
echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
}
-DOCKER_DIR=$(dirname $(realpath $0))
-PROJECT_DIR=$(dirname $DOCKER_DIR )
+DOCKER_DIR=$(dirname $(dirname $(realpath $0)))
+PROJECT_DIR=$(dirname $DOCKER_DIR)
SCRATCH_DIR="$HOME/.heron-compile"
SRC_TAR="$SCRATCH_DIR/src.tar.gz"
@@ -91,7 +91,7 @@
setup_scratch_dir() {
mkdir -p $1/artifacts
- cp $DOCKER_DIR/* $1
+ cp -r $DOCKER_DIR/* $1
}
setup_output_dir() {
@@ -130,9 +130,9 @@
export HERON_TREE_STATUS="${HERON_TREE_STATUS:-$(heron_tree_status)}"
if [ $TARGET_PLATFORM = "darwin" ]; then
- docker/compile-platform.sh
+ docker/scripts/compile-platform.sh
else
- docker/compile-docker.sh
+ docker/scripts/compile-docker.sh
fi
}
diff --git a/docker/build-docker.sh b/docker/scripts/build-docker.sh
similarity index 100%
rename from docker/build-docker.sh
rename to docker/scripts/build-docker.sh
diff --git a/docker/build-exec-docker.sh b/docker/scripts/build-exec-docker.sh
similarity index 100%
rename from docker/build-exec-docker.sh
rename to docker/scripts/build-exec-docker.sh
diff --git a/docker/ci-docker.sh b/docker/scripts/ci-docker.sh
similarity index 95%
rename from docker/ci-docker.sh
rename to docker/scripts/ci-docker.sh
index c081c89..71d89cb 100755
--- a/docker/ci-docker.sh
+++ b/docker/scripts/ci-docker.sh
@@ -5,7 +5,7 @@
echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
}
-DOCKER_DIR=$(dirname $(realpath $0))
+DOCKER_DIR=$(dirname $(dirname $(realpath $0)))
PROJECT_DIR=$(dirname $DOCKER_DIR )
SCRATCH_DIR="$HOME/.heron-docker"
@@ -25,7 +25,7 @@
mkdir $1/artifacts
fi
- cp $DOCKER_DIR/* $1
+ cp -r $DOCKER_DIR/* $1
}
build_exec_image() {
@@ -46,7 +46,7 @@
DOCKER_IMAGE_FILE="$OUTPUT_DIRECTORY/heron-$TARGET_PLATFORM-$HERON_VERSION.tar"
fi
- DOCKER_FILE="$SCRATCH_DIR/Dockerfile.dist.$TARGET_PLATFORM"
+ DOCKER_FILE="$SCRATCH_DIR/dist/Dockerfile.dist.$TARGET_PLATFORM"
setup_scratch_dir $SCRATCH_DIR
diff --git a/docker/cleanup-dockers.sh b/docker/scripts/cleanup-dockers.sh
similarity index 100%
rename from docker/cleanup-dockers.sh
rename to docker/scripts/cleanup-dockers.sh
diff --git a/docker/compile-docker.sh b/docker/scripts/compile-docker.sh
similarity index 93%
rename from docker/compile-docker.sh
rename to docker/scripts/compile-docker.sh
index cdbfbb8..5b6490e 100755
--- a/docker/compile-docker.sh
+++ b/docker/scripts/compile-docker.sh
@@ -6,7 +6,7 @@
echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
}
-DOCKER_DIR=$(dirname $(realpath $0))
+DOCKER_DIR=$(dirname $(dirname $(realpath $0)))
PROJECT_DIR=$(dirname $DOCKER_DIR)
verify_dockerfile_exists() {
@@ -17,7 +17,7 @@
}
dockerfile_path_for_platform() {
- echo "$SCRATCH_DIR/Dockerfile.$1"
+ echo "$SCRATCH_DIR/compile/Dockerfile.$1"
}
copy_bazel_rc_to() {
diff --git a/docker/compile-platform.sh b/docker/scripts/compile-platform.sh
similarity index 89%
rename from docker/compile-platform.sh
rename to docker/scripts/compile-platform.sh
index b18bfa1..01e32f5 100755
--- a/docker/compile-platform.sh
+++ b/docker/scripts/compile-platform.sh
@@ -35,8 +35,8 @@
bazel clean
echo "Creating packages"
-bazel build -c opt --config=$CONFIG_PLATFORM scripts/packages:tarpkgs
-bazel build -c opt --config=$CONFIG_PLATFORM scripts/packages:binpkgs
+bazel build -c opt --jobs 25 --config=$CONFIG_PLATFORM scripts/packages:tarpkgs
+bazel build -c opt --jobs 25 --config=$CONFIG_PLATFORM scripts/packages:binpkgs
echo "Moving packages to /$OUTPUT_DIRECTORY"
for file in ./bazel-bin/scripts/packages/*.tar.gz; do
