From 76c4a34d044bb414745fc3ad96864afaf662f3f5 Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Fri, 9 Jun 2023 15:28:18 -0400
Subject: [PATCH] alpine-base.dockerfile: docker-compose.yml:
 ruby-2-5-5-alpine3-9

---
 .dockerignore          | 1 +
 alpine-base.dockerfile | 8 ++++++--
 docker-compose.yml     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 183ff80..621900a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
+!*
 !whatami
diff --git a/alpine-base.dockerfile b/alpine-base.dockerfile
index af75240..f7593d4 100644
--- a/alpine-base.dockerfile
+++ b/alpine-base.dockerfile
@@ -1,12 +1,14 @@
 ARG DIND_VERSION=${DIND_VERSION}
-FROM docker:${DIND_VERSION}-git as base
+FROM docker:${DIND_VERSION}-git as dind
+FROM docker.io/library/docker:20.10.16-git as git
+FROM docker.io/library/ruby:2.5.5-alpine3.9 as base
 
 RUN apk update \
     && apk add ${VERBOSE} ${NO_CACHE} \
         alpine-sdk \
 		bash-completion \
+		bash \
 		curl \
-		git \
 		openssh-client \
 		shadow \
 		sudo \
@@ -14,6 +16,8 @@ RUN apk update \
 		vim
 
 FROM scratch as user
+COPY --from=dind . .
+COPY --from=git . .
 COPY --from=base . .
 COPY whatami /usr/local/bin/
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ff9c9d..9966d15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
         - PASSWORD=${PASSWORD}
     command: ["tail", "-f", "/dev/null"]
     volumes:
-      - ${HOME:-.}:/home/${HOST_USER}
+      - ${HOME:-.}:/home
       - ${PWD:-.}:/home/${HOST_USER}/alpine_shell
 
   alpine-guix:
@@ -46,7 +46,7 @@ services:
         - PASSWORD=${PASSWORD}
     command: ["tail", "-f", "/dev/null"]
     volumes:
-      - ${HOME:-.}:/home/${HOST_USER}
+      - ${HOME:-.}:/home
       - ${PWD:-.}:/home/${HOST_USER}/alpine_shell
 
   ubuntu: