diff --git a/Dockerfile b/Dockerfile index bfcd12c..df10086 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,46 +8,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="alex-phillips, homerr" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - git \ - composer \ - yarn && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - curl \ - php7 \ - php7-ctype \ - php7-ldap \ - php7-gd \ - php7-pdo \ - php7-pdo_sqlite \ - php7-tokenizer && \ - echo "**** install grocy ****" && \ - mkdir -p /app/grocy && \ - if [ -z ${GROCY_RELEASE+x} ]; then \ - GROCY_RELEASE=$(curl -sX GET "https://api.github.com/repos/grocy/grocy/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/grocy.tar.gz -L \ - "https://github.com/grocy/grocy/archive/${GROCY_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/grocy.tar.gz -C \ - /app/grocy/ --strip-components=1 && \ - cp -R /app/grocy/data/plugins \ - /defaults/plugins && \ - echo "**** install composer packages ****" && \ - composer install -d /app/grocy --no-dev && \ - echo "**** install yarn packages ****" && \ - cd /app/grocy && \ - yarn && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + git \ + composer \ + yarn && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + curl \ + php7 \ + php7-ctype \ + php7-ldap \ + php7-gd \ + php7-pdo \ + php7-pdo_sqlite \ + php7-tokenizer && \ + echo "**** install grocy ****" && \ + mkdir -p /app/grocy && \ + if [ -z ${GROCY_RELEASE+x} ]; then \ + GROCY_RELEASE=$(curl -sX GET "https://api.github.com/repos/grocy/grocy/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/grocy.tar.gz -L \ + "https://github.com/grocy/grocy/archive/${GROCY_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/grocy.tar.gz -C \ + /app/grocy/ --strip-components=1 && \ + cp -R /app/grocy/data/plugins \ + /defaults/plugins && \ + echo "**** install composer packages ****" && \ + composer install -d /app/grocy --no-dev && \ + echo "**** install yarn packages ****" && \ + cd /app/grocy && \ + yarn && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e7b7d4d..98ea027 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,46 +8,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="alex-phillips, homerr" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - git \ - composer \ - yarn && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - curl \ - php7 \ - php7-ctype \ - php7-ldap \ - php7-gd \ - php7-pdo \ - php7-pdo_sqlite \ - php7-tokenizer && \ - echo "**** install grocy ****" && \ - mkdir -p /app/grocy && \ - if [ -z ${GROCY_RELEASE+x} ]; then \ - GROCY_RELEASE=$(curl -sX GET "https://api.github.com/repos/grocy/grocy/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/grocy.tar.gz -L \ - "https://github.com/grocy/grocy/archive/${GROCY_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/grocy.tar.gz -C \ - /app/grocy/ --strip-components=1 && \ - cp -R /app/grocy/data/plugins \ - /defaults/plugins && \ - echo "**** install composer packages ****" && \ - composer install -d /app/grocy --no-dev && \ - echo "**** install yarn packages ****" && \ - cd /app/grocy && \ - yarn && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + git \ + composer \ + yarn && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + curl \ + php7 \ + php7-ctype \ + php7-ldap \ + php7-gd \ + php7-pdo \ + php7-pdo_sqlite \ + php7-tokenizer && \ + echo "**** install grocy ****" && \ + mkdir -p /app/grocy && \ + if [ -z ${GROCY_RELEASE+x} ]; then \ + GROCY_RELEASE=$(curl -sX GET "https://api.github.com/repos/grocy/grocy/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/grocy.tar.gz -L \ + "https://github.com/grocy/grocy/archive/${GROCY_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/grocy.tar.gz -C \ + /app/grocy/ --strip-components=1 && \ + cp -R /app/grocy/data/plugins \ + /defaults/plugins && \ + echo "**** install composer packages ****" && \ + composer install -d /app/grocy --no-dev && \ + echo "**** install yarn packages ****" && \ + cd /app/grocy && \ + yarn && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1cd4956..a0e3e77 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,46 +8,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="alex-phillips, homerr" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - git \ - composer \ - yarn && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - curl \ - php7 \ - php7-ctype \ - php7-ldap \ - php7-gd \ - php7-pdo \ - php7-pdo_sqlite \ - php7-tokenizer && \ - echo "**** install grocy ****" && \ - mkdir -p /app/grocy && \ - if [ -z ${GROCY_RELEASE+x} ]; then \ - GROCY_RELEASE=$(curl -sX GET "https://api.github.com/repos/grocy/grocy/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/grocy.tar.gz -L \ - "https://github.com/grocy/grocy/archive/${GROCY_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/grocy.tar.gz -C \ - /app/grocy/ --strip-components=1 && \ - cp -R /app/grocy/data/plugins \ - /defaults/plugins && \ - echo "**** install composer packages ****" && \ - composer install -d /app/grocy --no-dev && \ - echo "**** install yarn packages ****" && \ - cd /app/grocy && \ - yarn && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + git \ + composer \ + yarn && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + curl \ + php7 \ + php7-ctype \ + php7-ldap \ + php7-gd \ + php7-pdo \ + php7-pdo_sqlite \ + php7-tokenizer && \ + echo "**** install grocy ****" && \ + mkdir -p /app/grocy && \ + if [ -z ${GROCY_RELEASE+x} ]; then \ + GROCY_RELEASE=$(curl -sX GET "https://api.github.com/repos/grocy/grocy/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/grocy.tar.gz -L \ + "https://github.com/grocy/grocy/archive/${GROCY_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/grocy.tar.gz -C \ + /app/grocy/ --strip-components=1 && \ + cp -R /app/grocy/data/plugins \ + /defaults/plugins && \ + echo "**** install composer packages ****" && \ + composer install -d /app/grocy --no-dev && \ + echo "**** install yarn packages ****" && \ + cd /app/grocy && \ + yarn && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # copy local files COPY root/ / diff --git a/README.md b/README.md index 76bc851..75f617c 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ The architectures supported by this image are: ## Application Setup -Grocy is simple to get running. Configure the container with the above instructions, start it, and you can then access it +Grocy is simple to get running. Configure the container with instructions below, start it, and you can then access it by visiting http://your.ip:9283 - once the page loads, you can log in with the default username and password of admin / admin ## Usage @@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.04.21:** - Update docs to reflect jenkins builder changes * **17.02.21:** - Rebasing to alpine 3.13. * **26.01.21:** - Add 'ldap' PHP extension. * **22.12.20:** - Add 'ctype' PHP extension. diff --git a/readme-vars.yml b/readme-vars.yml index 23be960..84c9675 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,12 +33,13 @@ param_ports: # application setup block app_setup_block_enabled: true app_setup_block: | - Grocy is simple to get running. Configure the container with the above instructions, start it, and you can then access it + Grocy is simple to get running. Configure the container with instructions below, start it, and you can then access it by visiting http://your.ip:9283 - once the page loads, you can log in with the default username and password of admin / admin # changelog changelogs: + - { date: "08.04.21:", desc: "Update docs to reflect jenkins builder changes" } - { date: "17.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "26.01.21:", desc: "Add 'ldap' PHP extension." } - { date: "22.12.20:", desc: "Add 'ctype' PHP extension." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index fe4dd4e..48593da 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -6,11 +6,11 @@ mkdir -p /app/grocy/data/viewcache || : # create symlinks i=/app/grocy/data [[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]] && \ - rm -Rf "$i" && \ - ln -s /config/"$(basename "$i")" "$i" + rm -Rf "$i" && \ + ln -s /config/"$(basename "$i")" "$i" [[ -e "$i" && ! -L "$i" ]] && \ - mv "$i" /config/"$(basename "$i")" && \ - ln -s /config/"$(basename "$i")" "$i" + mv "$i" /config/"$(basename "$i")" && \ + ln -s /config/"$(basename "$i")" "$i" # check for config file and copy default if needed [[ ! -f "/config/data/config.php" ]] && \