Fix make binaries target to be consistent with rest of Makefile
This commit is contained in:
parent
5c455f056b
commit
cbe8a1c3db
2 changed files with 8 additions and 45 deletions
11
Makefile
11
Makefile
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
SHELL := bash
|
SHELL := bash
|
||||||
|
|
||||||
# linux/amd64 linux/arm64 linux/arm/v7
|
# linux/amd64,linux/arm64,linux/arm/v7
|
||||||
DOCKER_PLATFORM ?= linux/amd64
|
DOCKER_PLATFORM ?= linux/amd64
|
||||||
DOCKER_OUTPUT ?= --load
|
DOCKER_OUTPUT ?= --load
|
||||||
|
|
||||||
|
|
@ -34,7 +34,12 @@ docker-gpu:
|
||||||
docker buildx build . -f Dockerfile.gpu --tag 'mycroftai/mimic3:gpu' $(DOCKER_OUTPUT)
|
docker buildx build . -f Dockerfile.gpu --tag 'mycroftai/mimic3:gpu' $(DOCKER_OUTPUT)
|
||||||
|
|
||||||
binaries:
|
binaries:
|
||||||
rm -rf "dist/$(DOCKER_PLATFORM)"
|
echo "$(DOCKER_PLATFORM)" | sed -e 's/,/\n/g' | \
|
||||||
docker buildx build . -f Dockerfile.binary --platform $(DOCKER_PLATFORM) --output "type=local,dest=dist/$(DOCKER_PLATFORM)"
|
while read -r platform; do \
|
||||||
|
echo "$${platform}"; \
|
||||||
|
rm -rf "dist/$${platform}"; \
|
||||||
|
docker buildx build . -f Dockerfile.binary --platform "$${platform}" --output "type=local,dest=dist/$${platform}"; \
|
||||||
|
done
|
||||||
|
|
||||||
debian:
|
debian:
|
||||||
|
debian/build-debian.sh
|
||||||
|
|
|
||||||
42
debian/build-binaries.sh
vendored
42
debian/build-binaries.sh
vendored
|
|
@ -1,42 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2022 Mycroft AI Inc.
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# Builds PyInstaller binaries for all platforms.
|
|
||||||
#
|
|
||||||
set -eo pipefail
|
|
||||||
|
|
||||||
# Directory of *this* script
|
|
||||||
this_dir="$( cd "$( dirname "$0" )" && pwd )"
|
|
||||||
src_dir="$(realpath "${this_dir}/..")"
|
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
|
||||||
# All platforms
|
|
||||||
platforms=('linux/amd64' 'linux/arm64' 'linux/arm/v7')
|
|
||||||
else
|
|
||||||
# Only platforms from command-line arguments
|
|
||||||
platforms=("$@")
|
|
||||||
fi
|
|
||||||
|
|
||||||
pushd "${src_dir}"
|
|
||||||
|
|
||||||
for platform in "${platforms[@]}"; do
|
|
||||||
DOCKER_PLATFORM="${platform}" \
|
|
||||||
make binaries
|
|
||||||
done
|
|
||||||
|
|
||||||
popd
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue