From c2c165c3f31c273667e676ae7ae63cd71fa44995 Mon Sep 17 00:00:00 2001
From: Sean McBride <spmcbride1201@gmail.com>
Date: Wed, 31 Mar 2021 17:01:46 -0400
Subject: [PATCH] chore: Cleanup Dockerfile

---
 Dockerfile.x86_64 | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index c1a388e..6722c54 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -1,6 +1,4 @@
-# Inspired by lucet's Dockerfile.
-
-# using ubuntu 18 docker image
+# using ubuntu 20 docker image
 FROM ubuntu:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -34,9 +32,26 @@ RUN apt-get install -y --no-install-recommends \
 RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
 RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-8 100
 
-# Test Script Stuff
+# Needed to install from http endpoints via curl
 RUN apt-get install -y --no-install-recommends \
   curl \
+  ca-certificates \
+  libssl-dev
+
+# Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable --component rustfmt --target wasm32-wasi -y
+ENV PATH=/root/.cargo/bin:$PATH
+RUN cargo install --debug cargo-audit cargo-watch rsign2
+
+# WASI-SDK
+RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-7/wasi-sdk_7.0_amd64.deb && dpkg -i wasi-sdk_7.0_amd64.deb && rm -f wasi-sdk_7.0_amd64.deb
+ENV WASI_SDK=/opt/wasi-sdk
+
+# Test Script Stuff
+RUN apt-get install -y --no-install-recommends \
+  fonts-dejavu \
+  fonts-cascadia-code \
+  fonts-roboto \
   imagemagick \
   netpbm \
   pango1.0-tools \
@@ -46,23 +61,14 @@ RUN apt-get install -y --no-install-recommends \
 # Interactive Tools
 RUN apt-get install -y --no-install-recommends \
   less \
-  lldb-8 \
+  gdb \
   strace \
   vim
 
-# SSL Stuff - What is this used for?
-RUN apt-get install -y --no-install-recommends \
-  ca-certificates \
-  libssl-dev
-
-# Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable --component rustfmt --target wasm32-wasi -y
-ENV PATH=/root/.cargo/bin:$PATH
-RUN cargo install --debug cargo-audit cargo-watch rsign2
-
-# WASI-SDK
-RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-7/wasi-sdk_7.0_amd64.deb && dpkg -i wasi-sdk_7.0_amd64.deb && rm -f wasi-sdk_7.0_amd64.deb
-ENV WASI_SDK=/opt/wasi-sdk
+# We need to set the locale for pango-view
+ENV LANG C.UTF-8
+ENV LANGUAGE C.UTF-8
+ENV LC_ALL C.UTF-8
 
 ENV PATH=/opt/sledge/bin:$PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH