Fix registry path

docs/index.md

@@ -156,9 +156,9 @@ fi
 
 Last final step before we have a fully functional docker image is to build the actual image:
 
-    docker build --no-cache -t registry.git.feneas.org/feneas/federation/testsuite_testproject:v1.0.3-testproject .
+    docker build --no-cache -t registry.git.feneas.org/feneas/federation/testsuite/testproject:v1.0.3-testproject .
 
-The testsuite requires a special naming for every image: `registry.git.feneas.org/feneas/federation/testsuite_<project>:<version>-<project>`
+The testsuite requires a special naming for every image: `registry.git.feneas.org/feneas/federation/testsuite/<project>:<version>-<project>`
 
 If we succesfully build the docker image we have to commit our changes
 and create a project tag and we are done with the image part:

scripts/build_docker_image.sh

@@ -10,10 +10,10 @@ docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY || exit
 
 # build the image locally
 docker build -t \
-  ${CI_REGISTRY_IMAGE}_${project}:$CI_COMMIT_TAG . || exit 1
+  ${CI_REGISTRY_IMAGE}/${project}:$CI_COMMIT_TAG . || exit 1
 # overwrite latest-tag with new image
-docker tag ${CI_REGISTRY_IMAGE}_${project}:$CI_COMMIT_TAG \
-  ${CI_REGISTRY_IMAGE}_${project}:latest || exit 1
+docker tag ${CI_REGISTRY_IMAGE}/${project}:$CI_COMMIT_TAG \
+  ${CI_REGISTRY_IMAGE}/${project}:latest || exit 1
 # upload the image and both tags
-docker push ${CI_REGISTRY_IMAGE}_${project}:$CI_COMMIT_TAG || exit 1
-docker push ${CI_REGISTRY_IMAGE}_${project}:latest || exit 1
+docker push ${CI_REGISTRY_IMAGE}/${project}:$CI_COMMIT_TAG || exit 1
+docker push ${CI_REGISTRY_IMAGE}/${project}:latest || exit 1

test_helper.bash

@@ -83,11 +83,11 @@ function start_app() {
     params="-e PROJECT=$PROJECT -e PRSHA=$PRSHA -e PRREPO=$PRREPO"
   fi
   cid=$(container_id "$1")
-  echo "Starting docker container $cid (${CI_REGISTRY_IMAGE}_$3) on port $2"
+  echo "Starting docker container $cid (${CI_REGISTRY_IMAGE}/$3) on port $2"
   docker run --name=$cid $params \
     --link $(container_id "postgres"):postgreshost \
     --link $(container_id "redis"):redishost \
-    -e DATABASE=$1 -e PORT=$2 -d ${CI_REGISTRY_IMAGE}_$3
+    -e DATABASE=$1 -e PORT=$2 -d ${CI_REGISTRY_IMAGE}/$3
 }
 
 # stop_app "g1"