diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index bc8ee761..5a85cae7 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -11,8 +11,8 @@ RUN ./occ app:disable password_policy RUN OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1 RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2 -RUN ./occ app:install news -RUN ./occ app:install notes +RUN ./occ app:install news # 20.0.0 +RUN ./occ app:install notes # 4.6.0 RUN ./occ app:enable password_policy # TODO: This stopped working randomly with apache not being able to bind to the port during build. Must be some docker changes? diff --git a/tool/update.sh b/tool/update.sh index 10c93121..eca0e8f7 100755 --- a/tool/update.sh +++ b/tool/update.sh @@ -24,10 +24,12 @@ elif [ -d "external/nextcloud-$1" ]; then git reset --hard "$latest_tag" git submodule update + # shellcheck disable=SC2001 + latest_version=$(echo "$latest_tag" | sed "s/^v//") if [[ "$1" == "server" ]]; then - # shellcheck disable=SC2001 - image_version=$(echo "$latest_tag" | sed "s/^v//") - sed -i "s/FROM nextcloud:.*/FROM nextcloud:$image_version/" ../../tool/Dockerfile.dev + sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version/" ../../tool/Dockerfile.dev + else + sed -i "s/RUN \.\/occ app:install $1 .*/RUN .\/occ app:install $1 # $latest_version/" ../../tool/Dockerfile.dev fi ) else