From d65c7ea65f7d156a6d1231c28c64e88770f08075 Mon Sep 17 00:00:00 2001
From: Joseph Ferguson <yosifkit@gmail.com>
Date: Mon, 18 Dec 2023 16:17:52 -0800
Subject: [PATCH] Fix gitattributes file

Move templates to be consistent with other repos
---
 .gitattributes                                        | 6 +++---
 template/Dockerfile.debian => Dockerfile.debian       | 0
 template/Dockerfile.oracle => Dockerfile.oracle       | 0
 apply-templates.sh                                    | 4 ++--
 template/docker-entrypoint.sh => docker-entrypoint.sh | 0
 versions.sh                                           | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename template/Dockerfile.debian => Dockerfile.debian (100%)
 rename template/Dockerfile.oracle => Dockerfile.oracle (100%)
 rename template/docker-entrypoint.sh => docker-entrypoint.sh (100%)

diff --git a/.gitattributes b/.gitattributes
index dfa02cc85..6edb60681 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
-/*.*/**/Dockerfile*           linguist-generated
-/*.*/**/docker-entrypoint.sh  linguist-generated
-Dockerfile*                   linguist-language=Dockerfile
+/*/**/Dockerfile*           linguist-generated
+/*/**/docker-entrypoint.sh  linguist-generated
+Dockerfile*                 linguist-language=Dockerfile
diff --git a/template/Dockerfile.debian b/Dockerfile.debian
similarity index 100%
rename from template/Dockerfile.debian
rename to Dockerfile.debian
diff --git a/template/Dockerfile.oracle b/Dockerfile.oracle
similarity index 100%
rename from template/Dockerfile.oracle
rename to Dockerfile.oracle
diff --git a/apply-templates.sh b/apply-templates.sh
index 3c84529ab..9c6c2bf60 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -46,10 +46,10 @@ for version; do
 			dockerfile="Dockerfile.$variant"
 			{
 				generated_warning
-				gawk -f "$jqt" "template/$dockerfile"
+				gawk -f "$jqt" "$dockerfile"
 			} > "$version/$dockerfile"
 		fi
 	done
 
-	cp -a template/docker-entrypoint.sh "$version/docker-entrypoint.sh"
+	cp -a docker-entrypoint.sh "$version/docker-entrypoint.sh"
 done
diff --git a/template/docker-entrypoint.sh b/docker-entrypoint.sh
similarity index 100%
rename from template/docker-entrypoint.sh
rename to docker-entrypoint.sh
diff --git a/versions.sh b/versions.sh
index 92a61fd08..f8a208849 100755
--- a/versions.sh
+++ b/versions.sh
@@ -62,7 +62,6 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
-	[ "$version" != 'template' ] || continue
 	export version
 
 	doc='{}'