diff --git a/.github/Dockerfile b/.github/Dockerfile index a0307b49..2e393449 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -12,11 +12,10 @@ RUN chown -R $(whoami) /app RUN flutter pub get -RUN make tar VERSION=${BUILD_VERSION} ARCH=arm64 PKG_ARCH=aarch64 - RUN alias dpkg-deb="dpkg-deb --Zxz" &&\ flutter_distributor package --platform=linux --targets=deb --skip-clean +RUN make tar VERSION=${BUILD_VERSION} ARCH=arm64 PKG_ARCH=aarch64 RUN mv build/spotube-linux-*-aarch64.tar.xz dist/ &&\ mv dist/**/spotube-*-linux.deb dist/Spotube-linux-aarch64.deb diff --git a/cli/commands/build/linux_arm.dart b/cli/commands/build/linux_arm.dart index 7bc8372b..a09f0980 100644 --- a/cli/commands/build/linux_arm.dart +++ b/cli/commands/build/linux_arm.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:args/command_runner.dart'; +import 'package:path/path.dart'; import '../../core/env.dart'; import 'common.dart'; @@ -18,7 +19,7 @@ class LinuxArmBuildCommand extends Command with BuildCommandCommonSteps { await shell.run( "docker buildx build --platform=linux/arm64 " - "-f .github/Dockerfile . " + "-f ${join(cwd.path, ".github", "Dockerfile")} ${cwd.path} " "--build-arg FLUTTER_VERSION=${CliEnv.flutterVersion} " "--build-arg BUILD_VERSION=${CliEnv.channel == BuildChannel.nightly ? "nightly" : versionWithoutBuildNumber} " "-t krtirtho/spotube_linux_arm:latest "