From f53a3f795963bc29ed40a9ca8d4f6694e0343eac Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 13 Jun 2019 04:12:54 -0400 Subject: [PATCH] Fix docker version file path Signed-off-by: Roberto Rosario --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 662bf001df..c5acf0587c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ job_docker_build: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - docker build --pull -t "$CI_REGISTRY_IMAGE" -f docker/Dockerfile . - - VERSION=`cat docker/version` + - VERSION=`cat docker/rootfs/version` - docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$VERSION" - docker run --rm "$CI_REGISTRY_IMAGE:$VERSION" run-tests - docker push "$CI_REGISTRY_IMAGE:$VERSION" @@ -37,7 +37,7 @@ job_docker_push: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - VERSION=`cat docker/version` + - VERSION=`cat docker/rootfs/version` - docker pull "$CI_REGISTRY_IMAGE:$VERSION" - docker tag "$CI_REGISTRY_IMAGE:$VERSION" registry-1.docker.io/mayanedms/mayanedms:"$VERSION" - docker tag "$CI_REGISTRY_IMAGE:$VERSION" registry-1.docker.io/mayanedms/mayanedms:latest