removed duplicate stuff

.gitignore

@@ -1,6 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
+/rustscan-debbuilder/target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

rustscan-debbuilder/docker-compose.override.yml

@@ -0,0 +1,11 @@
+# Test builder. Rename to something else (like docker-compose.override.yml.bak)
+# to use the normal builder.
+version: '3'
+services:
+    rustscan-builder:
+        build:
+            context: ..
+            dockerfile: rustscan-debbuilder/testing/Dockerfile
+        image: rustscan-builder-dev
+        volumes:
+            - ./target:/sourcefiles/target

rustscan-debbuilder/docker-compose.yml

@@ -0,0 +1,7 @@
+version: '3'
+services:
+    rustscan-builder:
+        build: ./dockerstuff
+        image: rustscan-builder
+        volumes:
+            - ./debs:/debs

rustscan-debbuilder/dockerstuff/Dockerfile

@@ -1,20 +1,20 @@
-FROM rust:latest
+FROM rust:latest
-
+
-RUN git clone https://github.com/brandonskerritt/RustScan
+RUN git clone https://github.com/brandonskerritt/RustScan
-WORKDIR "/RustScan"
+WORKDIR "/RustScan"
-RUN git pull --force
+RUN git pull --force
-RUN cargo install cargo-deb
+RUN cargo install cargo-deb
-
+
-RUN apt update -y && apt upgrade -y
+RUN apt update -y && apt upgrade -y
-RUN apt install libc6-dev-i386 -y
+RUN apt install libc6-dev-i386 -y
-RUN git clone --depth=1 https://github.com/raspberrypi/tools /raspberrypi-tools
+RUN git clone --depth=1 https://github.com/raspberrypi/tools /raspberrypi-tools
-ENV PATH=/raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/:$PATH
+ENV PATH=/raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/:$PATH
-ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
+ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
-RUN mkdir /root/.cargo
+RUN mkdir /root/.cargo
-RUN echo "[target.arm-unknown-linux-gnueabihf]" >> /root/.cargo/config
+RUN echo "[target.arm-unknown-linux-gnueabihf]" >> /root/.cargo/config
-RUN echo "strip = { path = \"arm-linux-gnueabihf-strip\" }" >> /root/.cargo/config
+RUN echo "strip = { path = \"arm-linux-gnueabihf-strip\" }" >> /root/.cargo/config
-RUN echo "objcopy = { path = \"arm-linux-gnueabihf-objcopy\" }" >> /root/.cargo/config
+RUN echo "objcopy = { path = \"arm-linux-gnueabihf-objcopy\" }" >> /root/.cargo/config
-
+
-COPY ./entrypoint.sh /entrypoint.sh
+COPY ./entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

rustscan-debbuilder/run.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-docker build -t rustscan-builder . || exit
-
-# This creates a volume which binds your currentdirectory/debs to 
-# the location where the deb files get spat out in the container.
-# You don't need to worry about it. Just chmod +x run.sh && ./run.sh and
-# you'll get yer .deb file in a few minutes. It runs faster after you've used it the first time.
-docker run -v "$(pwd)/debs:/debs" rustscan-builder

rustscan-debbuilder/testing/Dockerfile

@@ -0,0 +1,18 @@
+FROM rust:latest
+
+COPY . /sourcefiles
+WORKDIR "/sourcefiles"
+
+RUN apt update -y && apt upgrade -y
+RUN apt install libc6-dev-i386 -y
+RUN git clone --depth=1 https://github.com/raspberrypi/tools /raspberrypi-tools
+ENV PATH=/raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/:$PATH
+ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
+RUN mkdir /root/.cargo
+RUN echo "[target.arm-unknown-linux-gnueabihf]" >> /root/.cargo/config
+RUN echo "strip = { path = \"arm-linux-gnueabihf-strip\" }" >> /root/.cargo/config
+RUN echo "objcopy = { path = \"arm-linux-gnueabihf-objcopy\" }" >> /root/.cargo/config
+
+COPY rustscan-debbuilder/testing/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

rustscan-debbuilder/testing/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cd /sourcefiles
+
+#amd64
+cargo build --release
+
+#arm64
+rustup target add arm-unknown-linux-gnueabihf
+cargo build --release --target=arm-unknown-linux-gnueabihf
+
+#i386
+rustup target add i686-unknown-linux-gnu
+cargo build --release --target=i686-unknown-linux-gnu