Skip to content

Commit

Permalink
fix jenkinsfile
Browse files Browse the repository at this point in the history
  • Loading branch information
aptalca committed Apr 15, 2021
1 parent 68877c7 commit 34dad58
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 39 deletions.
11 changes: 6 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
## Readme

If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-overseerr/edit/master/readme-vars.yml).
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-overseerr/edit/develop/readme-vars.yml).

These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-overseerr)
Expand Down Expand Up @@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the

### Testing your changes

```
```bash
git clone https://github.com/linuxserver/docker-overseerr.git
cd docker-overseerr
docker build \
Expand All @@ -106,15 +106,16 @@ docker build \
```

The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
```

```bash
docker run --rm --privileged multiarch/qemu-user-static:register --reset
```

Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

## Update the chagelog
## Update the changelog

If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-overseerr/tree/master/root), add an entry to the changelog
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-overseerr/tree/develop/root), add an entry to the changelog

```yml
changelogs:
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

------------------------------

- [ ] I have read the [contributing](https://github.com/linuxserver/docker-overseerr/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-overseerr/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

------------------------------

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fi
echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_OVERSEERR_DEVELOP\". ****"
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sX GET https://api.github.com/repos/sct/overseerr/commits?sha=develop | jq -r 'first(.[] | select(.commit.message | contains("[skip ci]") | not)) | .sha')
EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/sct/overseerr/commits?sha=develop | jq -r 'first(.[] | select(.commit.message | contains("[skip ci]") | not)) | .sha')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for overseerr branch develop"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
steps:
- uses: actions/first-interaction@v1
with:
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-overseerr/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-overseerr/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-overseerr/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-overseerr/blob/develop/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-overseerr/blob/develop/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-overseerr/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
repo-token: ${{ secrets.GITHUB_TOKEN }}
12 changes: 4 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Overseerr\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library.
\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library. \" \
--no-cache --pull -t ${IMAGE}:${META_TAG} \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
}
Expand All @@ -421,8 +420,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Overseerr\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library.
\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library. \" \
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
}
Expand All @@ -449,8 +447,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Overseerr\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library.
\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library. \" \
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
Expand Down Expand Up @@ -484,8 +481,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Overseerr\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library.
\" \
--label \"org.opencontainers.image.description=[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library. \" \
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
Expand Down
48 changes: 26 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- DO NOT EDIT THIS FILE MANUALLY -->
<!-- Please read the CONTRIBUTING.md -->
<!-- Please read the https://github.com/linuxserver/docker-overseerr/blob/develop/.github/CONTRIBUTING.md -->

[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

Expand All @@ -12,13 +12,14 @@

The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:

* regular and timely application updates
* easy user mappings (PGID, PUID)
* custom base image with s6 overlay
* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
* regular security updates
* regular and timely application updates
* easy user mappings (PGID, PUID)
* custom base image with s6 overlay
* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
* regular security updates

Find us at:

* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
Expand All @@ -40,7 +41,6 @@ Find us at:

[Overseerr](https://overseerr.dev/) is a free and open source software application for managing requests for your media library.


[![overseerr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/overseerr.png)](https://overseerr.dev/)

## Supported Architectures
Expand All @@ -66,6 +66,10 @@ This image provides various versions that are available via tags. `latest` tag u
| latest | Stable releases from GitHub |
| develop | Development releases from commits in upstream develop branch |

## Application Setup

Access the webui at `<your-ip>:5055`, for more information check out [Overseerr](https://overseerr.dev/).

## Usage

Here are some example snippets to help you get started creating a container.
Expand Down Expand Up @@ -94,7 +98,7 @@ services:
### docker cli
```
```bash
docker run -d \
--name=overseerr \
-e PUID=1000 \
Expand All @@ -106,7 +110,6 @@ docker run -d \
ghcr.io/linuxserver/overseerr
```


## Parameters

Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
Expand All @@ -125,7 +128,7 @@ You can set any environment variable from a file by using a special prepend `FIL

As an example:

```
```bash
-e FILE__PASSWORD=/run/secrets/mysecretpassword
```

Expand All @@ -144,24 +147,17 @@ Ensure any volume directories on the host are owned by the same user you specify

In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:

```
```bash
$ id username
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
```


&nbsp;
## Application Setup

Access the webui at `<your-ip>:5055`, for more information check out [Overseerr](https://overseerr.dev/).


## Docker Mods

[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=overseerr&query=%24.mods%5B%27overseerr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=overseerr "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")

We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.


## Support Info

* Shell access whilst the container is running: `docker exec -it overseerr /bin/bash`
Expand All @@ -178,38 +174,45 @@ Most of our images are static, versioned, and require an image update and contai
Below are the instructions for updating containers:

### Via Docker Compose

* Update all images: `docker-compose pull`
* or update a single image: `docker-compose pull overseerr`
* Let compose update all containers as necessary: `docker-compose up -d`
* or update a single container: `docker-compose up -d overseerr`
* You can also remove the old dangling images: `docker image prune`

### Via Docker Run

* Update the image: `docker pull ghcr.io/linuxserver/overseerr`
* Stop the running container: `docker stop overseerr`
* Delete the container: `docker rm overseerr`
* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
* You can also remove the old dangling images: `docker image prune`

### Via Watchtower auto-updater (only use if you don't remember the original parameters)

* Pull the latest image at its tag and replace it with the same env variables in one run:
```

```bash
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
containrrr/watchtower \
--run-once overseerr
```

* You can also remove the old dangling images: `docker image prune`

**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).

### Image Update Notifications - Diun (Docker Image Update Notifier)

* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.

## Building locally

If you want to make local modifications to these images for development purposes or just to customize the logic:
```

```bash
git clone https://github.com/linuxserver/docker-overseerr.git
cd docker-overseerr
docker build \
Expand All @@ -219,7 +222,8 @@ docker build \
```

The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
```

```bash
docker run --rm --privileged multiarch/qemu-user-static:register --reset
```

Expand Down

0 comments on commit 34dad58

Please sign in to comment.