Moved all Containerfile to Dockerfile

Seems that docker has a hard time using containerfile references, for example .containerignore was not used, reverting this renaming to allow docker to work properly
NethServer · Oct 25, 2022 · bc29a53 · bc29a53
1 parent 2b37c0e
commit bc29a53
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/.containerignore → .dockerignore b/.containerignore → .dockerignore
diff --git a/containers/nginx/Containerfile → containers/nginx/Dockerfile b/containers/nginx/Containerfile → containers/nginx/Dockerfile
diff --git a/containers/php/Containerfile → containers/php/Dockerfile b/containers/php/Containerfile → containers/php/Dockerfile
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -7,7 +7,7 @@ variable "REPOSITORY" {
 }
 
 variable "TAG" {
-    default = "master"
+    default = "latest"
 }
 
 target "base" {
@@ -17,7 +17,7 @@ target "base" {
 
 target "app" {
     inherits = ["base"]
-    dockerfile = "containers/php/Containerfile"
+    dockerfile = "containers/php/Dockerfile"
     cache-from = [
         "type=registry,ref=${REGISTRY}/${REPOSITORY}-app:latest",
         "type=registry,ref=${REGISTRY}/${REPOSITORY}-app:master",
@@ -46,7 +46,7 @@ target "app-develop" {
 
 target "web" {
     inherits = ["base"]
-    dockerfile = "containers/nginx/Containerfile"
+    dockerfile = "containers/nginx/Dockerfile"
     cache-from = [
         "type=registry,ref=${REGISTRY}/${REPOSITORY}-web:latest",
         "type=registry,ref=${REGISTRY}/${REPOSITORY}-web:master",

diff --git a/renovate.json b/renovate.json
@@ -9,14 +9,6 @@
     "patch": {
         "automerge": true
     },
-    "dockerfile": {
-        "fileMatch": [
-            "(^|/|\\.)Dockerfile$",
-            "(^|/)Dockerfile[^/]*$",
-            "(^|/|\\.)Containerfile$",
-            "(^|/)Containerfile[^/]*$"
-        ]
-    },
     "schedule": [
         "* 2 * * 1"
     ],