diff --git a/Dockerfile b/Dockerfile index ab55e0c..b35a64f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,27 +25,27 @@ RUN \ python3 && \ echo "**** install diskover ****" && \ mkdir -p /app/diskover && \ - if [ -z ${DISKOVER_RELEASE+x} ]; then \ - DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover/releases/latest" \ + if [ -z ${DISKOVER_VERSION+x} ]; then \ + DISKOVER_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/diskover.tar.gz -L \ - "https://github.com/shirosaidev/diskover/archive/${DISKOVER_RELEASE}.tar.gz" && \ + "https://github.com/alex-phillips/diskover/archive/${DISKOVER_VERSION}.tar.gz" && \ tar xf \ /tmp/diskover.tar.gz -C \ /app/diskover/ --strip-components=1 && \ echo "**** install diskover-web ****" && \ mkdir -p /app/diskover-web && \ - DISKOVER_WEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover-web/releases/latest" \ + DISKOVER_WEB_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover-web/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - if [ "${DISKOVER_RELEASE}" != "${DISKOVER_WEB_RELEASE}" ] || [ -z ${DISKOVER_RELEASE+x} ]; then \ - DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover-web/releases/latest" \ + if [ "${DISKOVER_VERSION}" != "${DISKOVER_WEB_VERSION}" ] || [ -z ${DISKOVER_VERSION+x} ]; then \ + DISKOVER_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover-web/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/diskover-web.tar.gz -L \ - "https://github.com/shirosaidev/diskover-web/archive/${DISKOVER_RELEASE}.tar.gz" && \ + "https://github.com/alex-phillips/diskover-web/archive/${DISKOVER_VERSION}.tar.gz" && \ tar xf \ /tmp/diskover-web.tar.gz -C \ /app/diskover-web/ --strip-components=1 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index eb21447..06b8d75 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -28,27 +28,27 @@ RUN \ | php -- --install-dir=/usr/bin --filename=composer && \ echo "**** install diskover ****" && \ mkdir -p /app/diskover && \ - if [ -z ${DISKOVER_RELEASE+x} ]; then \ - DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover/releases/latest" \ + if [ -z ${DISKOVER_VERSION+x} ]; then \ + DISKOVER_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/diskover.tar.gz -L \ - "https://github.com/shirosaidev/diskover/archive/${DISKOVER_RELEASE}.tar.gz" && \ + "https://github.com/alex-phillips/diskover/archive/${DISKOVER_VERSION}.tar.gz" && \ tar xf \ /tmp/diskover.tar.gz -C \ /app/diskover/ --strip-components=1 && \ echo "**** install diskover-web ****" && \ mkdir -p /app/diskover-web && \ - DISKOVER_WEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover-web/releases/latest" \ + DISKOVER_WEB_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover-web/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - if [ "${DISKOVER_RELEASE}" != "${DISKOVER_WEB_RELEASE}" ] || [ -z ${DISKOVER_RELEASE+x} ]; then \ - DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover-web/releases/latest" \ + if [ "${DISKOVER_VERSION}" != "${DISKOVER_WEB_VERSION}" ] || [ -z ${DISKOVER_VERSION+x} ]; then \ + DISKOVER_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover-web/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/diskover-web.tar.gz -L \ - "https://github.com/shirosaidev/diskover-web/archive/${DISKOVER_RELEASE}.tar.gz" && \ + "https://github.com/alex-phillips/diskover-web/archive/${DISKOVER_VERSION}.tar.gz" && \ tar xf \ /tmp/diskover-web.tar.gz -C \ /app/diskover-web/ --strip-components=1 && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b4cd38d..32b004d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -28,27 +28,27 @@ RUN \ | php -- --install-dir=/usr/bin --filename=composer && \ echo "**** install diskover ****" && \ mkdir -p /app/diskover && \ - if [ -z ${DISKOVER_RELEASE+x} ]; then \ - DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover/releases/latest" \ + if [ -z ${DISKOVER_VERSION+x} ]; then \ + DISKOVER_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/diskover.tar.gz -L \ - "https://github.com/shirosaidev/diskover/archive/${DISKOVER_RELEASE}.tar.gz" && \ + "https://github.com/alex-phillips/diskover/archive/${DISKOVER_VERSION}.tar.gz" && \ tar xf \ /tmp/diskover.tar.gz -C \ /app/diskover/ --strip-components=1 && \ echo "**** install diskover-web ****" && \ mkdir -p /app/diskover-web && \ - DISKOVER_WEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover-web/releases/latest" \ + DISKOVER_WEB_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover-web/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - if [ "${DISKOVER_RELEASE}" != "${DISKOVER_WEB_RELEASE}" ] || [ -z ${DISKOVER_RELEASE+x} ]; then \ - DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/shirosaidev/diskover-web/releases/latest" \ + if [ "${DISKOVER_VERSION}" != "${DISKOVER_WEB_VERSION}" ] || [ -z ${DISKOVER_VERSION+x} ]; then \ + DISKOVER_VERSION=$(curl -sX GET "https://api.github.com/repos/alex-phillips/diskover-web/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/diskover-web.tar.gz -L \ - "https://github.com/shirosaidev/diskover-web/archive/${DISKOVER_RELEASE}.tar.gz" && \ + "https://github.com/alex-phillips/diskover-web/archive/${DISKOVER_VERSION}.tar.gz" && \ tar xf \ /tmp/diskover-web.tar.gz -C \ /app/diskover-web/ --strip-components=1 && \ diff --git a/Jenkinsfile b/Jenkinsfile index 8d49dbe..1de7eda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 = 'shirosaidev' + EXT_USER = 'alex-phillips' EXT_REPO = 'diskover' BUILD_VERSION_ARG = 'DISKOVER_VERSION' LS_USER = 'linuxserver' diff --git a/README.md b/README.md index 2c463db..ebb7e57 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ docker create \ -p 80:80 \ -p 9181:9181 \ -p 9999:9999 \ - -v :/config \ - -v :/data \ + -v /path/to/diskover/config:/config \ + -v /path/to/diskover/data:/data \ --restart unless-stopped \ linuxserver/diskover ``` @@ -111,8 +111,8 @@ services: - RUN_ON_START=true - USE_CRON=true volumes: - - :/config - - :/data + - /path/to/diskover/config:/config + - /path/to/diskover/data:/data ports: - 80:80 - 9181:9181 diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4a5ee0c..32bb408 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -8,7 +8,7 @@ release_tag: latest ls_branch: master repo_vars: - EXT_GIT_BRANCH = 'master' - - EXT_USER = 'shirosaidev' + - EXT_USER = 'alex-phillips' - EXT_REPO = 'diskover' - BUILD_VERSION_ARG = 'DISKOVER_VERSION' - LS_USER = 'linuxserver' diff --git a/readme-vars.yml b/readme-vars.yml index 2998fcc..2908813 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,8 +18,8 @@ common_param_env_vars_enabled: true #PGID, PUID, etc param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Persistent config files" } - - { vol_path: "/data", vol_host_path: "", desc: "Default mount point to crawl" } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } + - { vol_path: "/data", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Default mount point to crawl" } param_usage_include_ports: true param_ports: - { external_port: "80", internal_port: "80", port_desc: "diskover Web UI" } @@ -59,8 +59,8 @@ custom_compose: | - RUN_ON_START=true - USE_CRON=true volumes: - - :/config - - :/data + - /path/to/diskover/config:/config + - /path/to/diskover/data:/data ports: - 80:80 - 9181:9181