From 8f3d10f5d09545d09856d3de9915ab258be35ee4 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Fri, 15 Sep 2017 17:58:22 +0300 Subject: [PATCH] Remove docker-compose dep from CI --- .gitlab-ci.yml | 7 +++---- Dockerfile | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d76c996..9825198 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,15 +49,14 @@ deploy: - develop before_script: - docker info - - docker-compose --version - mkdir -p ~/.ssh - echo "$SSH_USER" - echo "$SSH_PRIVATE_KEY" - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - - docker-compose build - - docker-compose push + - docker build -t 86.50.143.82:5000/web20:latest + - docker push 86.50.143.82:5000/web20:latest - scp docker-compose.yml $SSH_USER@web.sik.party:~/deployment/docker-compose.yml - - ssh $SSH_USER@web.sik.party 'cd deployment && docker-compose pull web20:latest && docker-compose up -d' + - ssh $SSH_USER@web.sik.party 'cd deployment && docker-compose down && docker-compose pull web20:latest && docker-compose up -d' diff --git a/Dockerfile b/Dockerfile index 6f87337..cced68f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,5 +5,4 @@ RUN mkdir /code WORKDIR /code ADD requirements.txt /code/ RUN env -RUN pip install -r requirements.txt ADD . /code/