From a0c4f044fc0b44335b2e0cab446288e725752b22 Mon Sep 17 00:00:00 2001
From: Sean McBride <spmcbride1201@gmail.com>
Date: Thu, 3 Mar 2022 18:32:21 -0500
Subject: [PATCH] chore: Dockerfile changes

---
 Dockerfile.x86_64 | 35 ++++++++++-----------------
 install_deb.sh    | 60 +++++++++++++++++++++++++++--------------------
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index b4193633..5314b2d3 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -2,10 +2,8 @@
 FROM ubuntu:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG HEY_URL=https://hey-release.s3.us-east-2.amazonaws.com/hey_linux_amd64
-ARG WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk_12.0_amd64.deb
 ARG SHFMT_URL=https://github.com/mvdan/sh/releases/download/v3.2.4/shfmt_v3.2.4_linux_amd64
-ARG SHELLCHECK_URL=https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz
+ARG WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk_12.0_amd64.deb
 
 # Use bash, not sh
 SHELL ["/bin/bash", "-c"]
@@ -25,55 +23,53 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	binutils-dev \
 	cmake \
 	git \
+	gdb \
 	libtinfo5 \
 	libtool \
+	make \
 	pkg-config
 
 # Needed to install from http endpoints via curl or wget
 RUN apt-get update && apt-get install -y --no-install-recommends \
-	curl \
 	ca-certificates \
+	curl \
+	gpg-agent \
+	hey \
+	httpie \
 	libssl-dev \
 	lsb-release \
-	gpg-agent \
+	openssh-client \
 	software-properties-common \
 	wget
 
 # Test Script Stuff
 RUN apt-get update && apt-get install -y --no-install-recommends \
 	bc \
+	bsdmainutils \
 	fonts-dejavu \
 	fonts-cascadia-code \
 	fonts-roboto \
 	gnuplot \
-	httpie \
 	imagemagick \
 	jq \
 	libz3-4 \
 	netpbm \
 	pango1.0-tools \
+	shellcheck \
 	wamerican
 
-# Hey is a load generator we have to recklessly download from the 'net, as it is only published to brew
-# Binaries are only provided for AMD64 though, so ARM will have to build from source
-# See https://github.com/rakyll/hey
-RUN wget $HEY_URL -O hey && chmod +x hey && mv hey /usr/bin/hey
-
-# shfmt is a formatter for shell scripts
-RUN wget $SHFMT_URL -O shfmt && chmod +x shfmt && mv shfmt /usr/local/bin/shfmt
-RUN wget $SHELLCHECK_URL -O shellcheck && chmod +x shellcheck && mv shellcheck /usr/local/bin/shellcheck
-
 # Interactive Tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
-	bsdmainutils \
 	gdb \
 	less \
-	openssh-client \
 	strace \
 	valgrind \
 	vim \
 	wabt
 
+# shfmt is a formatter for shell scripts
+RUN wget $SHFMT_URL -O shfmt && chmod +x shfmt && mv shfmt /usr/local/bin/shfmt
+
 ENV LLVM_VERSION=12
 ADD install_llvm.sh /sledge/install_llvm.sh
 RUN ./sledge/install_llvm.sh $LLVM_VERSION
@@ -114,8 +110,3 @@ RUN cargo install --debug cargo-audit cargo-watch rsign2
 ENV LANG C.UTF-8
 ENV LANGUAGE C.UTF-8
 ENV LC_ALL C.UTF-8
-
-# Update PATH and LD_LIBRARY_PATH
-ENV PATH=/sledge/runtime/bin:$PATH
-ENV PATH=/sledge/awsm/target/release:$PATH
-ENV LD_LIBRARY_PATH=/sledge/runtime/bin:$LD_LIBRARY_PATH
diff --git a/install_deb.sh b/install_deb.sh
index 90eeb4ba..4219c241 100755
--- a/install_deb.sh
+++ b/install_deb.sh
@@ -16,50 +16,58 @@ else
 	exit 1
 fi
 
-sudo apt-get update && sudo apt-get install -y --no-install-recommends \
-	apt-utils \
-	man-db \
-	&& yes | unminimize
-
-sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+# General GCC C/C++ Build toolchain
+# pkg-config, libtool - used by PocketSphinx
+# cmake - used by cmsis
+sudo apt-get update && apt-get install -y --no-install-recommends \
 	automake \
-	bc \
-	bsdmainutils \
 	build-essential \
 	binutils-dev \
-	ca-certificates \
 	cmake \
+	git \
+	libtinfo5 \
+	libtool \
+	make \
+	pkg-config
+
+# Network Tools
+sudo apt-get update && apt-get install -y --no-install-recommends \
+	ca-certificates \
 	curl \
+	gpg-agent \
+	hey \
+	httpie \
+	libssl-dev \
+	lsb-release \
+	openssh-client \
+	software-properties-common \
+	wget
+
+sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+	bc \
+	bsdmainutils \
 	fonts-dejavu \
 	fonts-cascadia-code \
 	fonts-roboto \
-	gdb \
-	git \
-	gpg-agent \
 	gnuplot \
-	hey \
-	httpie \
 	imagemagick \
 	jq \
-	less \
-	libssl-dev \
-	libtinfo5 \
-	libtool \
 	libz3-4 \
-	lsb-release \
-	make \
 	netpbm \
-	openssh-client \
 	pango1.0-tools \
-	pkg-config \
 	shellcheck \
-	software-properties-common \
+	wamerican
+
+# Interactive Tools
+sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+	gdb \
+	less \
 	strace \
 	valgrind \
-	wabt \
-	wamerican \
-	wget
+	vim \
+	wabt
 
+# shfmt is a formatter for shell scripts
 wget $SHFMT_URL -O shfmt && chmod +x shfmt && sudo mv shfmt /usr/local/bin/shfmt
 
 sudo ./install_llvm.sh $LLVM_VERSION