From 5e5c71b4bf847df18ceadbca7773035c500e42e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Dec 2018 10:46:46 +0000 Subject: [PATCH] Bot Updating Templated Files --- Jenkinsfile | 8 ++++---- README.md | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29f91bc..a72f8a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "development" + branch "master" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -23,13 +23,13 @@ pipeline { sh '''#! /bin/bash TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout master cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ diff --git a/README.md b/README.md index 6d9b683..9327aae 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! -* [Podcast](https://podcast.linuxserver.io) - on hiatus. Coming back soon (late 2018). +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). # PSA: Changes are happening @@ -21,6 +21,7 @@ From August 2018 onwards, Linuxserver are in the midst of switching to a new CI TLDR: Multi-arch support is changing from multiple repos to one repo per container image. # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) +[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://images.microbadger.com/badges/version/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg) @@ -32,13 +33,13 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain ## Supported Architectures -Our images support multiple architectures such as `X86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). +Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). The architectures supported by this image are: | Architecture | Tag | | :----: | --- | -| X86-64 | amd64-latest | +| x86-64 | amd64-latest | | arm64 | arm64v8-latest | | armhf | arm32v6-latest | @@ -57,7 +58,8 @@ docker create \ -p 6767:6767 \ -v :/config \ -v :/movies \ - -v :/tv \ + --restart unless-stopped \ linuxserver/bazarr ``` @@ -85,7 +87,7 @@ services: volumes: - :/config - :/movies - - :/tv ports: - 6767:6767 mem_limit: 4096m