Skip to content

Commit

Permalink
Dockerfile: Disable branch pinning as it has no effect during build
Browse files Browse the repository at this point in the history
Signed-off-by: Tobias Knöppler <[email protected]>
  • Loading branch information
theCalcaholic committed Jan 20, 2023
1 parent 74f6427 commit 6eff7cf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
15 changes: 9 additions & 6 deletions bin/ncp-update
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ fi
}

# shellcheck disable=SC2164
[[ -f /.ncp-image ]] || cd "$TMPDIR" # update locally during build
[[ -f /.ncp-image ]] || {
cd "$TMPDIR" # update locally during build

[[ -z "$2" ]] || {
git fetch origin "$2" || {
echo "Error: Could not fetch $2"
exit 1
[[ -z "$2" ]] || {
git fetch origin "$2" || {
echo "Error: Could not fetch $2"
exit 1
}
git checkout FETCH_HEAD
}
git checkout FETCH_HEAD
}

echo -e "Performing updates"
Expand All @@ -61,4 +63,5 @@ fi

echo -e "NextCloudPi updated to version $VER"
exit 0

} # force to read the whole thing into memory, as its contents might change in update.sh
4 changes: 1 addition & 3 deletions build/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,7 @@ apt-get install --no-install-recommends -y wget ca-certificates; \
# install nextcloudpiset_app_param nc-datadir.sh DATADIR '/data-ro/ncdata' \
source /usr/local/etc/library.sh; \
cd /tmp/ncp-build/; \
branch=master; \
[[ "$ncp_ver" == "v0.0.0" ]] || branch="$ncp_ver"; \
BRANCH="$branch" install_app ncp.sh; \
install_app ncp.sh; \

mv /usr/local/etc/ncp-config.d/nc-init-copy.cfg /usr/local/etc/ncp-config.d/nc-init.cfg; \
run_app_unsafe bin/ncp/CONFIG/nc-init.sh; \
Expand Down

0 comments on commit 6eff7cf

Please sign in to comment.