From 7cb4b37ae2d23c09f9ecaf030d0bdd7320ce7cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 23 Mar 2018 12:42:56 +0100
Subject: [PATCH] Renamed some docker files to Dockerfile

This makes it simpler to manage by using the default name. It also helps
my editor to recognise the file and highlight it properly.
---
 docker/1_base/{base.docker => Dockerfile}         | 0
 docker/1_base/build.sh                            | 2 +-
 docker/3_buildwheels/{build.docker => Dockerfile} | 0
 docker/3_buildwheels/build.sh                     | 2 +-
 docker/4_run/{run.docker => Dockerfile}           | 0
 docker/4_run/build.sh                             | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename docker/1_base/{base.docker => Dockerfile} (100%)
 rename docker/3_buildwheels/{build.docker => Dockerfile} (100%)
 rename docker/4_run/{run.docker => Dockerfile} (100%)

diff --git a/docker/1_base/base.docker b/docker/1_base/Dockerfile
similarity index 100%
rename from docker/1_base/base.docker
rename to docker/1_base/Dockerfile
diff --git a/docker/1_base/build.sh b/docker/1_base/build.sh
index 814cc1f..a42540f 100755
--- a/docker/1_base/build.sh
+++ b/docker/1_base/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 # Uses --no-cache to always get the latest upstream (security) upgrades.
-exec docker build --no-cache "$@" -t pillar_base -f base.docker .
+exec docker build --no-cache "$@" -t pillar_base .
diff --git a/docker/3_buildwheels/build.docker b/docker/3_buildwheels/Dockerfile
similarity index 100%
rename from docker/3_buildwheels/build.docker
rename to docker/3_buildwheels/Dockerfile
diff --git a/docker/3_buildwheels/build.sh b/docker/3_buildwheels/build.sh
index 7875b2f..6f36a8b 100755
--- a/docker/3_buildwheels/build.sh
+++ b/docker/3_buildwheels/build.sh
@@ -22,7 +22,7 @@ fi
 echo "Wheelhouse is $WHEELHOUSE"
 mkdir -p "$WHEELHOUSE"
 
-docker build -t pillar_wheelbuilder -f build.docker .
+docker build -t pillar_wheelbuilder .
 
 GID=$(id -g)
 docker run --rm -i \
diff --git a/docker/4_run/run.docker b/docker/4_run/Dockerfile
similarity index 100%
rename from docker/4_run/run.docker
rename to docker/4_run/Dockerfile
diff --git a/docker/4_run/build.sh b/docker/4_run/build.sh
index 61d45ac..87e840d 100755
--- a/docker/4_run/build.sh
+++ b/docker/4_run/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
 
-docker build -t armadillica/blender_cloud:latest -f run.docker .
+docker build -t armadillica/blender_cloud:latest .
 
 echo "Done, built armadillica/blender_cloud:latest"