From e608e678545b2f5cb2f38ade76ecfb0695079201 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 5 Apr 2021 12:59:55 -0500 Subject: [PATCH] Add info about develop tag --- Dockerfile | 7 ++----- Dockerfile.aarch64 | 7 ++----- Dockerfile.armhf | 7 ++----- Jenkinsfile | 2 +- README.md | 8 ++++++++ jenkins-vars.yml | 2 +- readme-vars.yml | 2 +- root/etc/services.d/overseerr/run | 2 ++ 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fa3684..6063220 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ LABEL maintainer="nemchik" # set environment variables ENV HOME="/config" -ENV COMMIT_TAG="${OVERSEERR_VERSION}" RUN \ echo "**** install build packages ****" && \ @@ -27,9 +26,7 @@ RUN \ OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - if [ -z ${COMMIT_TAG+x} ]; then \ - COMMIT_TAG="${OVERSEERR_VERSION}"; \ - fi && \ + export COMMIT_TAG="${OVERSEERR_VERSION}" && \ curl -o \ /tmp/overseerr.tar.gz -L \ "https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \ @@ -44,7 +41,7 @@ RUN \ yarn build && \ yarn install --production --ignore-scripts --prefer-offline && \ yarn cache clean && \ - echo "{\"commitTag\": \"${OVERSEERR_VERSION}\"}" > committag.json && \ + echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \ rm -rf /app/overseerr/config && \ ln -s /config /app/overseerr/config && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1006234..9d39543 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,7 +9,6 @@ LABEL maintainer="nemchik" # set environment variables ENV HOME="/config" -ENV COMMIT_TAG="${OVERSEERR_VERSION}" RUN \ echo "**** install build packages ****" && \ @@ -27,9 +26,7 @@ RUN \ OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - if [ -z ${COMMIT_TAG+x} ]; then \ - COMMIT_TAG="${OVERSEERR_VERSION}"; \ - fi && \ + export COMMIT_TAG="${OVERSEERR_VERSION}" && \ curl -o \ /tmp/overseerr.tar.gz -L \ "https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \ @@ -44,7 +41,7 @@ RUN \ yarn build && \ yarn install --production --ignore-scripts --prefer-offline && \ yarn cache clean && \ - echo "{\"commitTag\": \"${OVERSEERR_VERSION}\"}" > committag.json && \ + echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \ rm -rf /app/overseerr/config && \ ln -s /config /app/overseerr/config && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 94c55c0..b62fcfc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -9,7 +9,6 @@ LABEL maintainer="nemchik" # set environment variables ENV HOME="/config" -ENV COMMIT_TAG="${OVERSEERR_VERSION}" RUN \ echo "**** install build packages ****" && \ @@ -27,9 +26,7 @@ RUN \ OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - if [ -z ${COMMIT_TAG+x} ]; then \ - COMMIT_TAG="${OVERSEERR_VERSION}"; \ - fi && \ + export COMMIT_TAG="${OVERSEERR_VERSION}" && \ curl -o \ /tmp/overseerr.tar.gz -L \ "https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \ @@ -44,7 +41,7 @@ RUN \ yarn build && \ yarn install --production --ignore-scripts --prefer-offline && \ yarn cache clean && \ - echo "{\"commitTag\": \"${OVERSEERR_VERSION}\"}" > committag.json && \ + echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \ rm -rf /app/overseerr/config && \ ln -s /config /app/overseerr/config && \ echo "**** cleanup ****" && \ diff --git a/Jenkinsfile b/Jenkinsfile index 5bb317d..cd97f26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - EXT_GIT_BRANCH = 'develop' + EXT_GIT_BRANCH = 'master' EXT_USER = 'sct' EXT_REPO = 'overseerr' BUILD_VERSION_ARG = 'OVERSEERR_VERSION' diff --git a/README.md b/README.md index ebd8f56..fe34651 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,14 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Stable releases from GitHub | +| develop | Development releases from commits in upstream develop branch | ## Usage diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e51aeef..187a4cf 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,7 @@ release_type: stable release_tag: latest ls_branch: main repo_vars: - - EXT_GIT_BRANCH = 'develop' + - EXT_GIT_BRANCH = 'master' - EXT_USER = 'sct' - EXT_REPO = 'overseerr' - BUILD_VERSION_ARG = 'OVERSEERR_VERSION' diff --git a/readme-vars.yml b/readme-vars.yml index 0377156..d246148 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -16,7 +16,7 @@ available_architectures: - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # development version -development_versions: false +development_versions: true development_versions_items: - { tag: "latest", desc: "Stable releases from GitHub" } - { tag: "develop", desc: "Development releases from commits in upstream develop branch" } diff --git a/root/etc/services.d/overseerr/run b/root/etc/services.d/overseerr/run index e244cb5..bc3d074 100644 --- a/root/etc/services.d/overseerr/run +++ b/root/etc/services.d/overseerr/run @@ -2,5 +2,7 @@ cd /app/overseerr || exit +export CONFIG_DIRECTORY="/config" + exec \ s6-setuidgid abc /usr/bin/yarn start