diff --git a/Dockerfile b/Dockerfile index 11acfc0..f322769 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,4 @@ RUN [ "pacman", "-Syu", "manjaro-tools-iso-git",\ # Import my Pacman GPG key RUN [ "pacman-key", "--recv-key", "2BA2DFA128BBD111034F7626C7833DB15753380A", "--keyserver", "keyserver.ubuntu.com" ] -# Clone the repository to the root home dir -RUN [ "git", "clone", "https://github.com/JPyke3/mbp-manjaro", "/root/iso-profiles"] - ENTRYPOINT buildiso -f -p $EDITION -k $KERNEL -t /root/out diff --git a/Scripts/build-all-in-docker.sh b/Scripts/build-all-in-docker.sh index 779ad42..c4c06fa 100755 --- a/Scripts/build-all-in-docker.sh +++ b/Scripts/build-all-in-docker.sh @@ -11,7 +11,7 @@ for f in ../manjaro/*; do # Make out directory mkdir -p ~/mbp-manjaro/out/"$e" # Run the container - docker run --privileged -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev + docker run --privileged -v ../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev # Clean docker system docker system prune -f fi @@ -23,7 +23,7 @@ for f in ../community/*; do # Make out directory mkdir -p ~/mbp-manjaro/out/"$e" # Run the container - docker run --privileged -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev + docker run --privileged -v ../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev # Clean docker system docker system prune -f fi