From e9534ef5c9c6e5809a20f3764129b5fdffc7d8ef Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Thu, 26 Mar 2020 00:28:59 +0100 Subject: [PATCH] main: update --- main.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/main.sh b/main.sh index 00d1804..73a4be7 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -directory="${INPUT_DIRECTORY:-$PWD}" +directory="$PWD/${INPUT_DIRECTORY}" os="${INPUT_OS:-"debian"}" cd "$directory" @@ -11,14 +11,14 @@ package="$(dpkg-parsechangelog -S Source)" version="$(dpkg-parsechangelog -S Version)" distribution="$(dpkg-parsechangelog -S Distribution | sed 's/UNRELEASED/unstable/')" -container="builder" +container="$package_$version" image="$os:$distribution" -workdir="/build/source" docker create \ + --tty \ --name "$container" \ - --volume "$directory":"$workdir" \ - --workdir "$workdir" \ + --volume "$directory":"$directory" \ + --workdir "$directory" \ "$image" \ sleep inf @@ -26,23 +26,17 @@ docker start \ "$container" docker exec \ - --tty \ "$container" \ apt-get update docker exec \ - --tty \ "$container" \ apt-get install -y dpkg-dev debhelper docker exec \ - --tty \ - --workdir "$workdir" \ "$container" \ - apt-get build-dep "$workdir" + apt-get build-dep "$directory" docker exec \ - --tty \ - --workdir "$workdir" \ "$container" \ dpkg-buildpackage -S -us -uc