External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Dockerfile: Disable branch pinning as it has no effect during build

Browse Source 
Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias Knöppler 2023-01-20 19:53:34 +01:00
parent 74f64278e5
commit 6eff7cf6de
No known key found for this signature in database
GPG Key ID: 3510056072886A8F
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/ncp-update
View File

@ -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"
@ -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
build/docker/Dockerfile
View File

@ -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; \