Commit e2d7f829 authored by echel0n's avatar echel0n

Merge branch '9.4.111'

parents b8618323 07d2e3c3
......@@ -38,8 +38,9 @@ deploy_docker_master:
script:
- echo $CI_COMMIT_SHA
- echo $CONTAINER_IMAGE
- echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" -t $CONTAINER_IMAGE:$(cat sickrage/version.txt) -f Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:latest || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE:$(cat sickrage/version.txt) -f Dockerfile .
- docker tag $CONTAINER_IMAGE:$(cat sickrage/version.txt) $CONTAINER_IMAGE:latest
- docker push $CONTAINER_IMAGE:$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:latest
......@@ -48,41 +49,43 @@ deploy_docker_master:
except:
- tags
#deploy_docker_master_arm32v7:
# stage: deploy
# image: docker:latest
# before_script:
# - docker run --rm --privileged multiarch/qemu-user-static:register --reset
# script:
# - echo $CI_COMMIT_SHA
# - echo $CONTAINER_IMAGE
# - echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
# - docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" -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 push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
# - docker push $CONTAINER_IMAGE:arm32v7-latest
# only:
# - master
# except:
# - tags
#
#deploy_docker_master_arm64v8:
# stage: deploy
# image: docker:latest
# before_script:
# - docker run --rm --privileged multiarch/qemu-user-static:register --reset
# script:
# - echo $CI_COMMIT_SHA
# - echo $CONTAINER_IMAGE
# - echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
# - docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" -t $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) -f Dockerfile.arm64v8 .
# - docker tag $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm64v8-latest
# - docker push $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt)
# - docker push $CONTAINER_IMAGE:arm64v8-latest
# only:
# - master
# except:
# - tags
deploy_docker_master_arm32v7:
stage: deploy
image: docker:latest
before_script:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
script:
- echo $CI_COMMIT_SHA
- echo $CONTAINER_IMAGE
- 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 push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm32v7-latest
only:
- master
except:
- tags
deploy_docker_master_arm64v8:
stage: deploy
image: docker:latest
before_script:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
script:
- echo $CI_COMMIT_SHA
- echo $CONTAINER_IMAGE
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:arm64v8-latest || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:arm64v8-latest -t $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) -f Dockerfile.arm64v8 .
- docker tag $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm64v8-latest
- docker push $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm64v8-latest
only:
- master
except:
- tags
deploy_docker_develop:
stage: deploy
......@@ -90,8 +93,9 @@ deploy_docker_develop:
script:
- echo $CI_COMMIT_SHA
- echo $CONTAINER_IMAGE
- echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" -t $CONTAINER_IMAGE:$(cat sickrage/version.txt) -f Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:develop || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:develop -t $CONTAINER_IMAGE:$(cat sickrage/version.txt) -f Dockerfile .
- docker tag $CONTAINER_IMAGE:$(cat sickrage/version.txt) $CONTAINER_IMAGE:develop
- docker push $CONTAINER_IMAGE:$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:develop
......@@ -100,38 +104,40 @@ deploy_docker_develop:
except:
- tags
#deploy_docker_develop_arm32v7:
# stage: deploy
# image: docker:latest
# before_script:
# - docker run --rm --privileged multiarch/qemu-user-static:register --reset
# script:
# - echo $CI_COMMIT_SHA
# - echo $CONTAINER_IMAGE
# - echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
# - docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" -t $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) -f Dockerfile.arm32v7 .
# - docker tag $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm32v7-develop
# - docker push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
# - docker push $CONTAINER_IMAGE:arm32v7-develop
# only:
# - develop
# except:
# - tags
#
#deploy_docker_develop_arm64v8:
# stage: deploy
# image: docker:latest
# before_script:
# - docker run --rm --privileged multiarch/qemu-user-static:register --reset
# script:
# - echo $CI_COMMIT_SHA
# - echo $CONTAINER_IMAGE
# - echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
# - docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" -t $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) -f Dockerfile.arm64v8 .
# - docker tag $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm64v8-develop
# - docker push $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt)
# - docker push $CONTAINER_IMAGE:arm64v8-develop
# only:
# - develop
# except:
# - tags
\ No newline at end of file
deploy_docker_develop_arm32v7:
stage: deploy
image: docker:latest
before_script:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
script:
- echo $CI_COMMIT_SHA
- echo $CONTAINER_IMAGE
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:arm32v7-develop || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:arm32v7-develop -t $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) -f Dockerfile.arm32v7 .
- docker tag $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm32v7-develop
- docker push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm32v7-develop
only:
- develop
except:
- tags
deploy_docker_develop_arm64v8:
stage: deploy
image: docker:latest
before_script:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
script:
- echo $CI_COMMIT_SHA
- echo $CONTAINER_IMAGE
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:arm64v8-develop || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:arm64v8-develop -t $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) -f Dockerfile.arm64v8 .
- docker tag $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm64v8-develop
- docker push $CONTAINER_IMAGE:arm64v8-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm64v8-develop
only:
- develop
except:
- tags
\ No newline at end of file
FROM multiarch/qemu-user-static:x86_64-arm as qemu
FROM alpine:3.9 as downloader
RUN wget --quiet -O /qemu-arm-static \
https://github.com/multiarch/qemu-user-static/releases/download/v4.0.0/qemu-arm-static ;\
chmod +x /qemu-arm-static
RUN wget https://github.com/multiarch/qemu-user-static/releases/download/v4.0.0/x86_64_qemu-arm-static.tar.gz -O - | tar -xz && chmod +x /qemu-arm-static
FROM arm32v7/python:3.7-alpine3.9
MAINTAINER echel0n <[email protected]>
......@@ -14,7 +10,7 @@ ENV SOURCE_COMMIT $SOURCE_COMMIT
ENV TZ 'Canada/Pacific'
# add qemu for cross build
COPY --from=qemu /usr/bin/qemu-* /usr/bin
COPY --from=downloader /qemu-arm-static /usr/bin/qemu-arm-static
# install app
COPY . /opt/sickrage/
......
FROM alpine:3.9 as downloader
RUN wget --quiet -O /qemu-aarch64-static \
https://github.com/multiarch/qemu-user-static/releases/download/v4.0.0/qemu-aarch64-static ;\
chmod +x /qemu-aarch64-static
RUN wget https://github.com/multiarch/qemu-user-static/releases/download/v4.0.0/x86_64_qemu-aarch64-static.tar.gz -O - | tar -xz && chmod +x /qemu-aarch64-static
FROM arm64v8/python:3.7-alpine3.9
MAINTAINER echel0n <[email protected]>
......
# Changelog
- * 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
- * 9d17dfa42 - 2019-07-08: Fixed issue with manually post-processing episodes, was a typo.
- * 9521413b7 - 2019-07-07: Release v9.4.109
- * ca70d11b6 - 2019-07-07: Release v9.4.108
......
9.4.110
\ No newline at end of file
9.4.111
\ 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