Commit 029331a6 authored by echel0n's avatar echel0n

Merge branch '9.4.113'

parents e2d7f829 f369fde9
......@@ -3,7 +3,7 @@ before_script:
stages:
- release
- deploy
# - deploy
variables:
CONTAINER_IMAGE: sickrage/sickrage
......@@ -31,6 +31,8 @@ sentry_release:
only:
- develop
- master
except:
- tags
deploy_docker_master:
stage: deploy
......@@ -45,9 +47,10 @@ deploy_docker_master:
- docker push $CONTAINER_IMAGE:$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:latest
only:
- master
- ^[0-9.]+$
except:
- tags
- branches
- triggers
deploy_docker_master_arm32v7:
stage: deploy
......@@ -60,13 +63,14 @@ deploy_docker_master_arm32v7:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:arm32v7-latest || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:arm32v7-latest -t $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) -f Dockerfile.arm32v7 .
- docker tag $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) $CONTAINER_IMAGE-arm32v7:latest
- docker tag $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm32v7:latest
- docker push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm32v7-latest
only:
- master
- ^[0-9.]+$
except:
- tags
- branches
- triggers
deploy_docker_master_arm64v8:
stage: deploy
......@@ -83,9 +87,10 @@ deploy_docker_master_arm64v8:
- docker push $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm64v8-latest
only:
- master
- ^[0-9.]+$
except:
- tags
- branches
- triggers
deploy_docker_develop:
stage: deploy
......@@ -100,9 +105,10 @@ deploy_docker_develop:
- docker push $CONTAINER_IMAGE:$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:develop
only:
- develop
- ^[0-9.]+dev[0-9]$
except:
- tags
- branches
- triggers
deploy_docker_develop_arm32v7:
stage: deploy
......@@ -119,9 +125,10 @@ deploy_docker_develop_arm32v7:
- docker push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm32v7-develop
only:
- develop
- ^[0-9.]+dev[0-9]$
except:
- tags
- branches
- triggers
deploy_docker_develop_arm64v8:
stage: deploy
......@@ -138,6 +145,7 @@ deploy_docker_develop_arm64v8:
- docker push $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm64v8-develop
only:
- develop
- ^[0-9.]+dev[0-9]$
except:
- tags
\ No newline at end of file
- branches
- triggers
\ No newline at end of file
......@@ -6,14 +6,12 @@ ENV SOURCE_COMMIT $SOURCE_COMMIT
ENV TZ 'Canada/Pacific'
# install app
COPY . /opt/sickrage/
COPY .. /opt/sickrage/
RUN apk add --update --no-cache libffi-dev openssl-dev libxml2-dev libxslt-dev linux-headers build-base git tzdata unrar
RUN pip install -U pip setuptools
RUN pip install -r /opt/sickrage/requirements.txt
# ports and volumes
EXPOSE 8081
VOLUME /config /downloads /tv /anime
......
......@@ -9,17 +9,13 @@ ENV SOURCE_COMMIT $SOURCE_COMMIT
ENV TZ 'Canada/Pacific'
# add qemu for cross build
COPY --from=downloader /qemu-arm-static /usr/bin/qemu-arm-static
# install app
COPY . /opt/sickrage/
COPY .. /opt/sickrage/
RUN apk add --update --no-cache libffi-dev openssl-dev libxml2-dev libxslt-dev linux-headers build-base git tzdata unrar
RUN pip install -U pip setuptools
RUN pip install -r /opt/sickrage/requirements.txt
# ports and volumes
EXPOSE 8081
VOLUME /config /downloads /tv /anime
......
......@@ -9,17 +9,13 @@ ENV SOURCE_COMMIT $SOURCE_COMMIT
ENV TZ 'Canada/Pacific'
# add qemu for cross build
COPY --from=downloader /qemu-aarch64-static /usr/bin/qemu-aarch64-static
# install app
COPY . /opt/sickrage/
COPY .. /opt/sickrage/
RUN apk add --update --no-cache libffi-dev openssl-dev libxml2-dev libxslt-dev linux-headers build-base git tzdata unrar
RUN pip install -U pip setuptools
RUN pip install -r /opt/sickrage/requirements.txt
# ports and volumes
EXPOSE 8081
VOLUME /config /downloads /tv /anime
......
# Changelog
- * 2df3ed969 - 2019-07-08: Release v9.4.112
- * 106bd300b - 2019-07-08: Testing automated docker builds.
- * aee26322d - 2019-07-08: Testing automated docker builds.
- * 07d2e3c35 - 2019-07-08: Release v9.4.111
- * 6b4378aea - 2019-07-08: Refactored GitLab CI/CD script and Dockerfiles to cut down build times.
- * b8618323f - 2019-07-08: Update Dockerfile.arm32v7
- * 43d40c38a - 2019-07-08: Release v9.4.110
......
9.4.111
\ No newline at end of file
9.4.113
\ No newline at end of file
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