Merge pull request #85 from linuxserver/master-repo

update repo
This commit is contained in:
aptalca 2021-01-18 16:08:04 -05:00 committed by GitHub
commit 82d59bd469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 9 deletions

View File

@ -18,7 +18,7 @@ jobs:
fi
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_OMBI_MASTER\". ****"
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/tidusjar/Ombi/releases/latest" | jq -r '. | .tag_name')
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" | jq -r '. | .tag_name')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for ombi branch master"

View File

@ -19,12 +19,12 @@ RUN \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/tidusjar/Ombi/releases/latest" \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/tidusjar/Ombi/releases/download/${OMBI_RELEASE}/linux.tar.gz" && \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \

View File

@ -19,12 +19,12 @@ RUN \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/tidusjar/Ombi/releases/latest" \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/tidusjar/Ombi/releases/download/${OMBI_RELEASE}/linux-arm64.tar.gz" && \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-arm64.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \

View File

@ -19,12 +19,12 @@ RUN \
mkdir -p \
/opt/ombi && \
if [ -z ${OMBI_RELEASE+x} ]; then \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/tidusjar/Ombi/releases/latest" \
OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/ombi-src.tar.gz -L \
"https://github.com/tidusjar/Ombi/releases/download/${OMBI_RELEASE}/linux-arm.tar.gz" && \
"https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-arm.tar.gz" && \
tar xzf /tmp/ombi-src.tar.gz -C \
/opt/ombi/ && \
chmod +x /opt/ombi/Ombi && \

2
Jenkinsfile vendored
View File

@ -17,7 +17,7 @@ pipeline {
GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
EXT_GIT_BRANCH = 'master'
EXT_USER = 'tidusjar'
EXT_USER = 'Ombi-app'
EXT_REPO = 'Ombi'
CONTAINER_NAME = 'ombi'
BUILD_VERSION_ARG = 'OMBI_RELEASE'

View File

@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **18.01.21:** - Update upstream repo. Deprecate `v4-preview` tag, which is merged to `development` tag upstream.
* **14.04.20:** - Add Ombi donate links.
* **10.05.19:** - Added an optional env variable for base url setting.
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

View File

@ -8,7 +8,7 @@ release_tag: latest
ls_branch: master
repo_vars:
- EXT_GIT_BRANCH = 'master'
- EXT_USER = 'tidusjar'
- EXT_USER = 'Ombi-app'
- EXT_REPO = 'Ombi'
- CONTAINER_NAME = 'ombi'
- BUILD_VERSION_ARG = 'OMBI_RELEASE'

View File

@ -55,6 +55,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "18.01.21:", desc: "Update upstream repo. Deprecate `v4-preview` tag, which is merged to `development` tag upstream." }
- { date: "14.04.20:", desc: "Add Ombi donate links." }
- { date: "10.05.19:", desc: "Added an optional env variable for base url setting." }
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }