From c17ae5e31d0f6f45cdb144ecf4b653d30494a039 Mon Sep 17 00:00:00 2001
From: Brandon Rhodes <brandon@rhodesmill.org>
Date: Thu, 24 Jun 2021 07:27:28 -0400
Subject: [PATCH] Put Docker container in explicitly named directory

---
 {container => Containers/docker-ubuntu-14.04}/Dockerfile | 0
 {container => Containers/docker-ubuntu-14.04}/README.md  | 0
 {container => Containers/docker-ubuntu-14.04}/run        | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename {container => Containers/docker-ubuntu-14.04}/Dockerfile (100%)
 rename {container => Containers/docker-ubuntu-14.04}/README.md (100%)
 rename {container => Containers/docker-ubuntu-14.04}/run (88%)

diff --git a/container/Dockerfile b/Containers/docker-ubuntu-14.04/Dockerfile
similarity index 100%
rename from container/Dockerfile
rename to Containers/docker-ubuntu-14.04/Dockerfile
diff --git a/container/README.md b/Containers/docker-ubuntu-14.04/README.md
similarity index 100%
rename from container/README.md
rename to Containers/docker-ubuntu-14.04/README.md
diff --git a/container/run b/Containers/docker-ubuntu-14.04/run
similarity index 88%
rename from container/run
rename to Containers/docker-ubuntu-14.04/run
index adade02..506e996 100755
--- a/container/run
+++ b/Containers/docker-ubuntu-14.04/run
@@ -15,7 +15,7 @@ cd "$(dirname $0)"
 # Build the Docker image from the instructions in the Dockerfile.
 # Name the resulting image "xephem".
 
-docker build -t xephem . 1>&2
+docker build -t xephem-ubuntu-14.04 . 1>&2
 
 # Run the "xephem" image, exposing several files from the host system
 # that together should let XEphem run and connect to X Windows:
@@ -27,8 +27,8 @@ docker build -t xephem . 1>&2
 exec docker run -ti \
      --net=host \
      -e DISPLAY=$DISPLAY \
-     -v ${PWD}/..:/src \
+     -v ${PWD}/../..:/src \
      -v /tmp/.X11-unix:/tmp/.X11-unix \
      -v ${XAUTHORITY}:/root/.Xauthority \
-     xephem \
+     xephem-ubuntu-14.04 \
      "$@"