Switch to working Cassandra mirror

CatalystCode · Feb 21, 2018 · de70c97 · de70c97
1 parent 516f15a
commit de70c97
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/project-fortis-services/docker/Dockerfile b/project-fortis-services/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM node:9.2.0
 ENV CASSANDRA_HOME="/opt/cassandra"
 ARG CASSANDRA_VERSION="3.11.0"
 ARG CASSANDRA_ARTIFACT="apache-cassandra-${CASSANDRA_VERSION}"
-ARG CASSANDRA_URL="http://www-eu.apache.org/dist/cassandra/${CASSANDRA_VERSION}/${CASSANDRA_ARTIFACT}-bin.tar.gz"
+ARG CASSANDRA_URL="http://archive.apache.org/dist/cassandra/${CASSANDRA_VERSION}/${CASSANDRA_ARTIFACT}-bin.tar.gz"
 RUN apt-get -qq install -y --no-install-recommends wget ca-certificates && \
     wget -qO - ${CASSANDRA_URL} | tar -xzC /opt && \
     ln -s /opt/${CASSANDRA_ARTIFACT} ${CASSANDRA_HOME}

diff --git a/project-fortis-services/travis/publish.sh b/project-fortis-services/travis/publish.sh
@@ -22,20 +22,6 @@ install_docker() {
   sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
 }
 
-pull_previous_image() {
-  local semver=(${TRAVIS_TAG//./ })
-  local x="${semver[0]}"
-  local y="${semver[1]}"
-  local z="${semver[2]}"
-  local vprev="${DOCKER_USERNAME}/project_fortis_services:${x}.${y}.$((z-1))"
-  local vnext="${DOCKER_USERNAME}/project_fortis_services:${TRAVIS_TAG}"
-
-  if [ "$z" -gt 0 ]; then
-    docker pull "${vprev}"
-    docker image tag "${vprev}" "${vnext}"
-  fi
-}
-
 create_image() {
   touch .env-secrets
   BUILD_TAG="${TRAVIS_TAG}" docker-compose build project_fortis_services
@@ -49,7 +35,6 @@ publish_image() {
 pushd "$(dirname $0)/../.."
 
 check_preconditions
-pull_previous_image
 install_docker
 create_image
 publish_image