diff --git a/bin/build_dist b/bin/build_dist index e8b30ac6..7990e6da 100755 --- a/bin/build_dist +++ b/bin/build_dist @@ -86,9 +86,18 @@ if [[ -n "${BUBBLE_DIST_HOME}" ]] ; then if [[ ${IS_DEV} -eq 0 ]] ; then cd ${BUBBLE_DIST_TOP} && rm -f latest && ln -sf ${BUBBLE_VERSION} latest echo "${BUBBLE_VERSION}" > latest.txt - cd ${BUBBLE_DIST_DIR} && ln -s "$(basename ${BUBBLE_DIST})" bubble.zip && ln -s "$(basename ${BUBBLE_DIST}).sha256" bubble.zip.sha256 - cd ${BUBBLE_DIST_DIR} && ln -s "$(basename ${BUBBLE_JAR_DIST})" bubble.jar && ln -s "$(basename ${BUBBLE_JAR_DIST}).sha256" bubble.jar.sha256 - cd ${BUBBLE_DIST_DIR} && ln -s "$(basename ${BUBBLE_FULL_JAR_DIST})" bubble-full.jar && ln -s "$(basename ${BUBBLE_FULL_JAR_DIST}).sha256" bubble-full.jar.sha256 + + cd ${BUBBLE_DIST_DIR} && rm -f bubble.zip* && \ + ln -s "$(basename ${BUBBLE_DIST})" bubble.zip && \ + ln -s "$(basename ${BUBBLE_DIST}).sha256" bubble.zip.sha256 + + cd ${BUBBLE_DIST_DIR} && rm -f bubble.jar* && \ + ln -s "$(basename ${BUBBLE_JAR_DIST})" bubble.jar && \ + ln -s "$(basename ${BUBBLE_JAR_DIST}).sha256" bubble.jar.sha256 + + cd ${BUBBLE_DIST_DIR} && rm -f bubble-full.jar* && \ + ln -s "$(basename ${BUBBLE_FULL_JAR_DIST})" bubble-full.jar && \ + ln -s "$(basename ${BUBBLE_FULL_JAR_DIST}).sha256" bubble-full.jar.sha256 fi echo "Published release: ${BUBBLE_DIST}" fi diff --git a/bin/jenkins/push_docker b/bin/jenkins/push_docker index a565c545..3d9e54a9 100755 --- a/bin/jenkins/push_docker +++ b/bin/jenkins/push_docker @@ -60,7 +60,7 @@ fi echo ">>> Found Bubble version ${VERSION}" echo ">>> Building docker bubble version ${VERSION} ..." -BUBBLE_DOCKER="${BUBBLE_DIR}/docker/bubble.sh" +BUBBLE_DOCKER="${BUBBLE_DIR}/bin/bdocker" ${BUBBLE_DOCKER} build "${VERSION}" || die "Error building docker image" ensure_docker_experimental_enabled diff --git a/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java b/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java index 84ef7457..fafdd279 100644 --- a/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java +++ b/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java @@ -120,9 +120,7 @@ public class DockerComputeDriver extends ComputeServiceDriverBase { return DockerClientImpl.getInstance(dockerConfig, client); } - private static final String[] PACKER_SERVICES = { - "redis", "postgresql", "supervisor", "cron", "nginx" - }; + private static final String[] PACKER_SERVICES = {"redis", "postgresql", "supervisor", "cron"}; @Override public void prepPackerDir(TempDir tempDir) { try {