From 12be26577f523957618201d52f8ed37185f285d4 Mon Sep 17 00:00:00 2001
From: Tine Jozelj <tine@tjo.space>
Date: Sat, 26 Dec 2020 17:01:48 +0100
Subject: [PATCH] feat: use alpine everywhere

---
 Dockerfile                   | 8 ++++----
 Makefile                     | 4 +---
 packages/Dockerfile.starship | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d98eb63..2f4e50c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,16 +44,16 @@ COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh /usr/bin/mosh
 COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh-server /usr/bin/mosh-server
 COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh-client /usr/bin/mosh-client
 # Golang
-COPY --from=golang:1.15.6 --chown=${SSH_USER} /usr/local/go /home/${SSH_USER}/.go
+COPY --from=golang:1.15.6-alpine --chown=${SSH_USER} /usr/local/go /home/${SSH_USER}/.go
 ENV PATH=/home/${SSH_USER}/.go/bin:$PATH
 # Rust
-COPY --from=rust:1.48.0 --chown=${SSH_USER} /usr/local/cargo /home/${SSH_USER}/.cargo
-COPY --from=rust:1.48.0 --chown=${SSH_USER} /usr/local/rustup /home/${SSH_USER}/.rustup
+COPY --from=rust:1.48.0-alpine --chown=${SSH_USER} /usr/local/cargo /home/${SSH_USER}/.cargo
+COPY --from=rust:1.48.0-alpine --chown=${SSH_USER} /usr/local/rustup /home/${SSH_USER}/.rustup
 ENV CARGO_HOME=/home/${SSH_USER}/.cargo
 ENV RUSTUP_HOME=/home/${SSH_USER}/.rustup
 ENV PATH=/home/${SSH_USER}/.cargo/bin:$PATH
 # Node
-COPY --from=node:15.5.0 /usr/local/bin/node /usr/local/bin/node
+COPY --from=node:15.5.0-alpine /usr/local/bin/node /usr/local/bin/node
 # TODO: Add yarbn/npm/npx/yarnpkg??
 
 # Create .dotfiles
diff --git a/Makefile b/Makefile
index 5451ccb..7c463dc 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,7 @@ template:
 	@go run ./main.go template workspace-action > .github/workflows/workspace.yaml
 
 pull:
-	@docker pull ghcr.io/mentos1386/workspace-ubuntu:edge
-	@docker pull ghcr.io/mentos1386/starship:0.47.0
-	@docker pull ghcr.io/mentos1386/kubectl:1.20.0
+	@docker pull ghcr.io/mentos1386/workspace:edge
 
 run:
 	@docker run -it --rm --workdir /home/tine --user tine ghcr.io/mentos1386/workspace:edge zsh
diff --git a/packages/Dockerfile.starship b/packages/Dockerfile.starship
index bedd6d4..a19a39a 100644
--- a/packages/Dockerfile.starship
+++ b/packages/Dockerfile.starship
@@ -1,4 +1,4 @@
-FROM rust:1 as build
+FROM rust:1-alpine as build
 
 WORKDIR /usr/src/starship