Merge pull request #1020 from infosiftr/template-move

Fix gitattributes file
docker-library · Dec 19, 2023 · c0c45e2 · c0c45e2
2 parents 0c342ca + d65c7ea
commit c0c45e2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git 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 → Dockerfile.debian b/template/Dockerfile.debian → Dockerfile.debian
diff --git a/template/Dockerfile.oracle → Dockerfile.oracle b/template/Dockerfile.oracle → Dockerfile.oracle
diff --git 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 → docker-entrypoint.sh b/template/docker-entrypoint.sh → docker-entrypoint.sh
diff --git a/versions.sh b/versions.sh
@@ -62,7 +62,6 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
-	[ "$version" != 'template' ] || continue
 	export version
 
 	doc='{}'