Actually fix dev container

Author: xarantolus

.devcontainer/Dockerfile

@@ -1,11 +1,21 @@
-FROM rust:1-buster
+FROM ubuntu:22.04
 
 RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y curl python3 python3-pip make gcc && \
-	curl -fsSL https://deb.nodesource.com/setup_21.x | bash - && \
-	apt-get install -y nodejs
+	DEBIAN_FRONTEND=noninteractive apt-get install -y curl python3 python3-pip make gcc git pkg-config libssl-dev
 
-RUN rustup component add clippy
+RUN curl -fsSL https://deb.nodesource.com/setup_21.x | bash - && \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+	echo "source $HOME/.cargo/env" >> $HOME/.bashrc
+
+RUN	$HOME/.cargo/bin/rustup component add clippy
+
+RUN $HOME/.cargo/bin/rustup target add wasm32-unknown-unknown
+
+RUN . $HOME/.cargo/env && \
+	curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
 COPY Makefile /tmp/Makefile
-RUN make -j -f /tmp/Makefile dependencies
+RUN . $HOME/.cargo/env && \
+	make -f /tmp/Makefile dependencies

.devcontainer/devcontainer.json

@@ -16,7 +16,6 @@
 		// Increase size of temporary in-memory filesystem for auto-generated binaries by test scripts
 		"--shm-size=1G"
 	],
-	"onCreateCommand": "curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh && echo \"Installing dependencies, this might take a while...\" && make dependencies",
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "rustc --version",
 	// Configure tool-specific properties.

Makefile

@@ -150,12 +150,9 @@ watch-programs:
 ######################
 ### Utilities
 ######################
-dependencies: python-dependencies
+dependencies:
 	cargo install cargo-tarpaulin cargo-watch python-launcher
-
-python-dependencies:
-	$(PY) -m pip install pyperclip tqdm
-
+	py -3 -m pip install pyperclip tqdm
 
 clean:
 	rm -rf $(RM_TARGETS)