From f76019b7dfa2c700ed686c626b07e4e0f359ee2b Mon Sep 17 00:00:00 2001
From: David Trudgian <dave@trudgian.net>
Date: Thu, 11 Jun 2020 10:45:23 -0500
Subject: [PATCH] Additional containers

---
 README.md                                     | 29 +++++++++++++++++--
 docker-issue4525/Dockerfile                   |  3 ++
 .../Dockerfile                                |  0
 .../README.md                                 |  0
 docker-lolcow/Dockerfile                      |  9 ++++++
 .../Dockerfile                                |  0
 .../README.md                                 |  0
 7 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 docker-issue4525/Dockerfile
 rename {docker-singularity-linkwh => docker-linkwh}/Dockerfile (100%)
 rename {docker-singularity-linkwh => docker-linkwh}/README.md (100%)
 create mode 100644 docker-lolcow/Dockerfile
 rename {docker-singuarity-userperms => docker-userperms}/Dockerfile (100%)
 rename {docker-singuarity-userperms => docker-userperms}/README.md (100%)

diff --git a/README.md b/README.md
index b24f273..acc6b81 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,33 @@
 Dockerfiles & Definition files used for containers pulled from the Singularity
 test suite.
 
+On hub.docker.com/u/sylabsio:
+
  - `docker-aufs-sanity`
- - `docker-singularity-userperms`
- - `docker-singularity-linkwh`
+ - `docker-userperms`
+ - `docker-linkwh`
+ - `docker-lolcow`
+ - `docker-issue4525`
+
+To build and push these containers for multiple architectures, using Docker
+Desktop...
+
+Ensure you are using Docker Desktop >2.0.4.0 and turn on Command Line
+Experimental Features in preferences.
+
+Setup a buildx multi-arch builder:
+
+```
+docker buildx create --name archbuilder
+docker buildx use archbuilder
+docker buildx inspect --bootstrap
+```
+
+Build and push the containers using the provided script:
+
+```
+./build_push_docker.sh
+```
+
 
 
diff --git a/docker-issue4525/Dockerfile b/docker-issue4525/Dockerfile
new file mode 100644
index 0000000..2c1d4b5
--- /dev/null
+++ b/docker-issue4525/Dockerfile
@@ -0,0 +1,3 @@
+FROM alpine:3
+RUN mkdir directory && touch file && chmod 000 directory file
+
diff --git a/docker-singularity-linkwh/Dockerfile b/docker-linkwh/Dockerfile
similarity index 100%
rename from docker-singularity-linkwh/Dockerfile
rename to docker-linkwh/Dockerfile
diff --git a/docker-singularity-linkwh/README.md b/docker-linkwh/README.md
similarity index 100%
rename from docker-singularity-linkwh/README.md
rename to docker-linkwh/README.md
diff --git a/docker-lolcow/Dockerfile b/docker-lolcow/Dockerfile
new file mode 100644
index 0000000..aa98168
--- /dev/null
+++ b/docker-lolcow/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y fortune cowsay lolcat
+
+ENV PATH /usr/games:${PATH}
+ENV LC_ALL=C
+
+ENTRYPOINT fortune | cowsay | lolcat
+
diff --git a/docker-singuarity-userperms/Dockerfile b/docker-userperms/Dockerfile
similarity index 100%
rename from docker-singuarity-userperms/Dockerfile
rename to docker-userperms/Dockerfile
diff --git a/docker-singuarity-userperms/README.md b/docker-userperms/README.md
similarity index 100%
rename from docker-singuarity-userperms/README.md
rename to docker-userperms/README.md