From 66d703b623364d988f6097a31013c36de922b77e Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Thu, 24 Mar 2022 03:38:06 +0100
Subject: [PATCH] Genericized containerfile

---
 .github/workflows/dockerhub.yml                         | 1 +
 Dockerfile => Containerfile                             | 0
 DEVELOPMENT.md                                          | 2 +-
 dev/{dockerrun.sh => run_docker.sh}                     | 2 +-
 dev/run_podman.sh                                       | 2 ++
 dev/templates/{Dockerfile.jinja => Containerfile.jinja} | 0
 6 files changed, 5 insertions(+), 2 deletions(-)
 rename Dockerfile => Containerfile (100%)
 rename dev/{dockerrun.sh => run_docker.sh} (68%)
 create mode 100644 dev/run_podman.sh
 rename dev/templates/{Dockerfile.jinja => Containerfile.jinja} (100%)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 1e3715b..2f339d4 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -35,6 +35,7 @@ jobs:
         uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b
         with:
           context: .
+          file: {context}/Containerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Containerfile
similarity index 100%
rename from Dockerfile
rename to Containerfile
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 167691c..b38de80 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -48,7 +48,7 @@ You can also build the package with
 You can also always build and run the server with
 
 ```console
-	sh ./dev/dockerrun.sh
+	sh ./dev/run_docker.sh
 ```
 
 This will use the directory `testdata`.
diff --git a/dev/dockerrun.sh b/dev/run_docker.sh
similarity index 68%
rename from dev/dockerrun.sh
rename to dev/run_docker.sh
index 5cb5df4..10c58b6 100644
--- a/dev/dockerrun.sh
+++ b/dev/run_docker.sh
@@ -1,2 +1,2 @@
-docker build -t maloja . -f Dockerfile
+docker build -t maloja . -f Containerfile
 docker run --rm -p 42010:42010 -v $PWD/testdata:/mlj -e MALOJA_DATA_DIRECTORY=/mlj maloja
diff --git a/dev/run_podman.sh b/dev/run_podman.sh
new file mode 100644
index 0000000..aebbfee
--- /dev/null
+++ b/dev/run_podman.sh
@@ -0,0 +1,2 @@
+podman build -t maloja . -f Containerfile
+podman run --rm -p 42010:42010 -v $PWD/testdata:/mlj -e MALOJA_DATA_DIRECTORY=/mlj maloja
diff --git a/dev/templates/Dockerfile.jinja b/dev/templates/Containerfile.jinja
similarity index 100%
rename from dev/templates/Dockerfile.jinja
rename to dev/templates/Containerfile.jinja