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

build-docker.sh: Remove docker-* prefix from tags during build (#1769)

Browse Source 
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias Knöppler 2023-05-01 13:59:42 +02:00 committed by Tobias K
parent c770c4190c
commit 83cc630932
No known key found for this signature in database
GPG Key ID: 44FD368932E645C1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/build-docker.sh
View File

@ -19,12 +19,13 @@ build_arch() {
local suffix="${5:-$arch}" local suffix="${5:-$arch}"
echo -e "\e[1m\n[ Build NCP Docker ${arch} ]\e[0m" echo -e "\e[1m\n[ Build NCP Docker ${arch} ]\e[0m"
version="${version?}"
DOCKER_BUILDKIT=1 docker build --pull --progress=plain . -f build/docker/Dockerfile \ DOCKER_BUILDKIT=1 docker build --pull --progress=plain . -f build/docker/Dockerfile \
--target "$target" -t "ownyourbits/$target-${suffix}:latest" \ --target "$target" -t "ownyourbits/$target-${suffix}:latest" \
--cache-from "ownyourbits/nextcloudpi-${suffix}" --build-arg "release=$release" --build-arg "arch=${arch}" \ --cache-from "ownyourbits/nextcloudpi-${suffix}" --build-arg "release=$release" --build-arg "arch=${arch}" \
--build-arg "arch_qemu=$arch_qemu" --build-arg "ncp_ver=${version?}" --build-arg "arch_qemu=$arch_qemu" --build-arg "ncp_ver=${version#docker-}"
docker tag "ownyourbits/${target}-${suffix}:latest" "ownyourbits/${target}-${suffix}:${version}" docker tag "ownyourbits/${target}-${suffix}:latest" "ownyourbits/${target}-${suffix}:${version#docker-}"
} }
get_arch_args() { get_arch_args() {

2
build/docker/Dockerfile
View File

@ -213,7 +213,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
rm /var/cache/debconf/*-old; \ rm /var/cache/debconf/*-old; \
# set version # set version
echo "${ncp_ver}" > /usr/local/etc/ncp-version echo "${ncp_ver#docker-}" > /usr/local/etc/ncp-version
COPY build/docker/nextcloudpi/000ncp /etc/services-enabled.d/ COPY build/docker/nextcloudpi/000ncp /etc/services-enabled.d/