vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2026-09-12 07:06:02 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed bash

Browse Source
This commit is contained in:
veeso
2021-10-11 20:40:20 +02:00
parent 8cf6c1fce3
commit 0aeca76f63
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/build/docker.sh
Vendored
+2 -2
View File
@@ -20,7 +20,7 @@ docker build --tag termscp-${VERSION}-x86_64_debian9 .
cd - cd -
mkdir -p ${PKGS_DIR}/deb/ mkdir -p ${PKGS_DIR}/deb/
mkdir -p ${PKGS_DIR}/x86_64-unknown-linux-gnu/ 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/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/ docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/termscp ${PKGS_DIR}/x86_64-unknown-linux-gnu/
# Make tar.gz # Make tar.gz
@@ -33,7 +33,7 @@ cd x86_64_centos7/
docker build --tag termscp-${VERSION}-x86_64_centos7 . docker build --tag termscp-${VERSION}-x86_64_centos7 .
cd - cd -
mkdir -p ${PKGS_DIR}/rpm/ 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 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 $? exit $?
dist/build/x86_64_centos7/Dockerfile
Vendored
+2 -1
View File
@@ -8,7 +8,8 @@ RUN yum -y install \
openssl \ openssl \
pkgconfig \ pkgconfig \
dbus-devel \ dbus-devel \
openssl-devel openssl-devel \
bash
# Install rust # Install rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \
chmod +x /tmp/rust.sh && \ chmod +x /tmp/rust.sh && \
dist/build/x86_64_debian9/Dockerfile
Vendored
+2 -1
View File
@@ -9,6 +9,7 @@ RUN apt update && apt install -y \
libssl-dev \ libssl-dev \
libssh2-1-dev \ libssh2-1-dev \
libdbus-1-dev \ libdbus-1-dev \
bash \
curl curl
# Install rust # Install rust
@@ -26,4 +27,4 @@ RUN . $HOME/.cargo/env && cargo build --release && cargo strip
# Build pkgs # Build pkgs
RUN . $HOME/.cargo/env && cargo deb RUN . $HOME/.cargo/env && cargo deb
CMD ["sh"] CMD ["bash"]