Commit 7f8c2d79 authored by echel0n's avatar echel0n

Merge branch 'hotfix-20190112' into develop

parents 6e96928b 60c219a5
image: docker:latest
services:
- name: docker:dind
before_script:
- apk add --no-cache py-pip
- pip install docker-compose
- echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
build-master:
variables:
CONTAINER_IMAGE: sickrage/sickrage:`cat sickrage/version.txt`
CONTAINER_IMAGE_LATEST: sickrage/sickrage:latest
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://localhost:2375
services:
- docker:dind
build:
stage: build
image: docker:latest
script:
- docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VERSION=`cat sickrage/version.txt` -t sickrage/sickrage:latest .
- docker push "sickrage/sickrage:latest"
- echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
- docker build --network host -t $CONTAINER_IMAGE_LATEST .
- docker tag ${CONTAINER_IMAGE} ${CONTAINER_IMAGE_LATEST}
- docker push ${CONTAINER_IMAGE}
- docker push ${CONTAINER_IMAGE_LATEST}
only:
- master
except:
- tags
#build-dev:
# stage: build
# script:
# - docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VERSION=`cat sickrage/version.txt` -t sickrage/sickrage:$CI_COMMIT_REF_SLUG .
# - docker push sickrage/sickrage:$CI_COMMIT_REF_SLUG
# except:
# - master
# - tags
\ No newline at end of file
- tags
\ No newline at end of file
FROM python:2
FROM python:2.7.15-alpine3.8
MAINTAINER echel0n <[email protected]>
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
# install app
COPY . /opt/sickrage/
RUN apk add --no-cache libffi-dev openssl-dev libxml2-dev libxslt-dev linux-headers build-base git
RUN pip install -U pip setuptools
RUN pip install -r /opt/sickrage/requirements.txt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment