From 0aeca76f63b8462805e0ad86cb95ddb6dfd85163 Mon Sep 17 00:00:00 2001 From: veeso Date: Mon, 11 Oct 2021 20:40:20 +0200 Subject: [PATCH] Fixed bash --- dist/build/docker.sh | 4 ++-- dist/build/x86_64_centos7/Dockerfile | 3 ++- dist/build/x86_64_debian9/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/build/docker.sh b/dist/build/docker.sh index 237c8e2..8c0e37b 100755 --- a/dist/build/docker.sh +++ b/dist/build/docker.sh @@ -20,7 +20,7 @@ docker build --tag termscp-${VERSION}-x86_64_debian9 . cd - mkdir -p ${PKGS_DIR}/deb/ mkdir -p ${PKGS_DIR}/x86_64-unknown-linux-gnu/ -CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_debian9 termscp-${VERSION}-x86_64_debian9) +CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_debian9 /bin/bash) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/debian/termscp_${VERSION}_amd64.deb ${PKGS_DIR}/deb/ docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/termscp ${PKGS_DIR}/x86_64-unknown-linux-gnu/ # Make tar.gz @@ -33,7 +33,7 @@ cd x86_64_centos7/ docker build --tag termscp-${VERSION}-x86_64_centos7 . cd - mkdir -p ${PKGS_DIR}/rpm/ -CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 termscp-${VERSION}-x86_64_centos7) +CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 /bin/bash) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.el7.x86_64.rpm ${PKGS_DIR}/rpm/termscp-${VERSION}-1.x86_64.rpm exit $? diff --git a/dist/build/x86_64_centos7/Dockerfile b/dist/build/x86_64_centos7/Dockerfile index 6e63aa8..f11ec5f 100644 --- a/dist/build/x86_64_centos7/Dockerfile +++ b/dist/build/x86_64_centos7/Dockerfile @@ -8,7 +8,8 @@ RUN yum -y install \ openssl \ pkgconfig \ dbus-devel \ - openssl-devel + openssl-devel \ + bash # Install rust RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \ chmod +x /tmp/rust.sh && \ diff --git a/dist/build/x86_64_debian9/Dockerfile b/dist/build/x86_64_debian9/Dockerfile index 1356c64..dbe1ebd 100644 --- a/dist/build/x86_64_debian9/Dockerfile +++ b/dist/build/x86_64_debian9/Dockerfile @@ -9,6 +9,7 @@ RUN apt update && apt install -y \ libssl-dev \ libssh2-1-dev \ libdbus-1-dev \ + bash \ curl # Install rust @@ -26,4 +27,4 @@ RUN . $HOME/.cargo/env && cargo build --release && cargo strip # Build pkgs RUN . $HOME/.cargo/env && cargo deb -CMD ["sh"] +CMD ["bash"]