ci(all): fix docker tags

daotl · Dec 12, 2023 · f15bf65 · f15bf65
1 parent 4579ab7
commit f15bf65
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/apps/desktop/project.json b/apps/desktop/project.json
@@ -31,10 +31,15 @@
           "metadata": {
             "images": [
               "daotl/web-monorepo-starter-desktop"
+            ],
+            "tags": [
+              "type=match,pattern=v(.*),group=1",
+              "type=edge,branch=main",
+              "type=sha,enable={{is_default_branch}},prefix=sha-",
             ]
           }
-          // "cache-from": ["type=registry,ref=daotl/web-monorepo-starter-desktop:buildcache-${{ github.ref_name }}"],
-          // "cache-to": ["type=registry,ref=daotl/web-monorepo-starter-desktop:buildcache-${{ github.ref_name }},mode=max"]
+          // "cache-from": ["type=registry,ref=daotl/web-monorepo-starter-desktop:buildcache-{{branch}}"],
+          // "cache-to": ["type=registry,ref=daotl/web-monorepo-starter-desktop:buildcache-{{branch}},mode=max"]
         }
       }
     }

diff --git a/apps/web/project.json b/apps/web/project.json
@@ -31,10 +31,15 @@
           "metadata": {
             "images": [
               "daotl/web-monorepo-starter-web"
+            ],
+            "tags": [
+              "type=match,pattern=v(.*),group=1",
+              "type=edge,branch=main",
+              "type=sha,enable={{is_default_branch}},prefix=sha-"
             ]
           }
-          // "cache-from": ["type=registry,ref=daotl/web-monorepo-starter-web:buildcache-${{ github.ref_name }}"],
-          // "cache-to": ["type=registry,ref=daotl/web-monorepo-starter-web:buildcache-${{ github.ref_name }},mode=max"]
+          // "cache-from": ["type=registry,ref=daotl/web-monorepo-starter-web:buildcache-{{branch}}"],
+          // "cache-to": ["type=registry,ref=daotl/web-monorepo-starter-web:buildcache-{{branch}},mode=max"]
         }
       }
     }

diff --git a/nx.js b/nx.js
@@ -50,11 +50,11 @@ const config = {
     },
 
     lint: {
-      input: [...inputsIgnore],
+      inputs: [...inputsIgnore],
       cache: true,
     },
     'lint:fix': {
-      input: [...inputsIgnore],
+      inputs: [...inputsIgnore],
       cache: true,
     },
 
@@ -69,13 +69,6 @@ const config = {
         ci: {
           load: false,
           push: true,
-          metadata: {
-            tags: [
-              'type=match,pattern=v(.*),group=1',
-              'type=edge,branch=main',
-              'type=sha,enable={{is_default_branch}},prefix=sha-',
-            ],
-          },
         },
       },
     },

diff --git a/nx.json b/nx.json
@@ -45,11 +45,11 @@
       "cache": false
     },
     "lint": {
-      "input": [],
+      "inputs": [],
       "cache": true
     },
     "lint:fix": {
-      "input": [],
+      "inputs": [],
       "cache": true
     },
     "container": {
@@ -67,14 +67,7 @@
       "configurations": {
         "ci": {
           "load": false,
-          "push": true,
-          "metadata": {
-            "tags": [
-              "type=match,pattern=v(.*),group=1",
-              "type=edge,branch=main",
-              "type=sha,enable={{is_default_branch}},prefix=sha-"
-            ]
-          }
+          "push": true
         }
       }
     },