a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: scripts: fix Dockerfile, build-release.sh 

Merge in DNS/adguard-home from 2276-fix-release-2 to master

Updates #2276.

Squashed commit of the following:

commit cc7edffca6862579a745600b4008428d4c9a73d9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 22:56:01 2020 +0300

    scripts: fix Dockerfile, build-release.sh
This commit is contained in:
Ainar Garipov 2020-12-30 23:18:15 +03:00
parent e20e94ddd4
commit 3706f559c1
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/make/Dockerfile
View File

@ -45,5 +45,5 @@ CMD [ \
"--no-check-update", \ "--no-check-update", \
"-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \ "-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \
"-h", "0.0.0.0", \ "-h", "0.0.0.0", \
"-w", "/opt/adguardhome/work", \ "-w", "/opt/adguardhome/work" \
] ]

25
scripts/make/build-release.sh
View File

@ -92,6 +92,9 @@ readonly arms='5
readonly mipses='softfloat' readonly mipses='softfloat'
# TODO(a.garipov): Remove armv6, because it was always overwritten by
# armv7. Rename armv7 to armhf. Rename the 386 snap to i386.
# os arch arm mips snap # os arch arm mips snap
readonly platforms="\ readonly platforms="\
darwin 386 0 0 0 darwin 386 0 0 0
@ -102,11 +105,11 @@ freebsd arm 5 0 0
freebsd arm 6 0 0 freebsd arm 6 0 0
freebsd arm 7 0 0 freebsd arm 7 0 0
freebsd arm64 0 0 0 freebsd arm64 0 0 0
linux 386 0 0 i386 linux 386 0 0 386
linux amd64 0 0 amd64 linux amd64 0 0 amd64
linux arm 5 0 0 linux arm 5 0 0
linux arm 6 0 0 linux arm 6 0 armv6
linux arm 7 0 armhf linux arm 7 0 armv7
linux arm64 0 0 arm64 linux arm64 0 0 arm64
linux mips 0 softfloat 0 linux mips 0 softfloat 0
linux mips64 0 softfloat 0 linux mips64 0 softfloat 0
@ -209,9 +212,23 @@ build() {
cp -r './scripts/snap/gui'\ cp -r './scripts/snap/gui'\
"${build_snap_dir}/meta/" "${build_snap_dir}/meta/"
# TODO(a.garipov): Remove this crutch later.
case "$build_snap"
in
('386')
build_snap_arch="i386"
;;
('armv6'|'armv7')
build_snap_arch="armhf"
;;
(*)
build_snap_arch="$build_snap"
;;
esac
# Create a snap.yaml file, setting the values. # Create a snap.yaml file, setting the values.
sed -e 's/%VERSION%/'"$version"'/'\ sed -e 's/%VERSION%/'"$version"'/'\
-e 's/%ARCH%/'"$build_snap"'/'\ -e 's/%ARCH%/'"$build_snap_arch"'/'\
./scripts/snap/snap.tmpl.yaml\ ./scripts/snap/snap.tmpl.yaml\
>"${build_snap_dir}/meta/snap.yaml" >"${build_snap_dir}/meta/snap.yaml"