chore: adjust Dockerfiles

openscript-ch · Sep 24, 2024 · 4e88188 · 4e88188
1 parent 4b49c8a
commit 4e88188
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 56 deletions.
diff --git a/apps/backend/package.json b/apps/backend/package.json
@@ -66,33 +66,5 @@
     ],
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
-  },
-  "nx": {
-    "targets": {
-      "container": {
-        "executor": "@nx-tools/nx-container:build",
-        "dependsOn": [
-          "build"
-        ],
-        "options": {
-          "context": "{projectRoot}",
-          "dockerfile": "{projectRoot}/Dockerfile",
-          "engine": "docker",
-          "metadata": {
-            "images": [
-              "backend"
-            ],
-            "load": true,
-            "tags": [
-              "type=schedule",
-              "type=ref,event=branch",
-              "type=ref,event=tag",
-              "type=ref,event=pr",
-              "type=sha,prefix=sha-"
-            ]
-          }
-        }
-      }
-    }
   }
 }
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -25,33 +25,5 @@
     "typescript": "^5.5.3",
     "typescript-eslint": "^8.0.1",
     "vite": "^5.4.1"
-  },
-  "nx": {
-    "targets": {
-      "container": {
-        "executor": "@nx-tools/nx-container:build",
-        "dependsOn": [
-          "build"
-        ],
-        "options": {
-          "context": "{projectRoot}",
-          "dockerfile": "{projectRoot}/Dockerfile",
-          "engine": "docker",
-          "metadata": {
-            "images": [
-              "frontend"
-            ],
-            "load": true,
-            "tags": [
-              "type=schedule",
-              "type=ref,event=branch",
-              "type=ref,event=tag",
-              "type=ref,event=pr",
-              "type=sha,prefix=sha-"
-            ]
-          }
-        }
-      }
-    }
   }
 }
diff --git a/nx.json b/nx.json
@@ -11,6 +11,30 @@
       "cache": true,
       "outputs": ["{projectRoot}/dist"]
     },
+    "container": {
+      "executor": "@nx-tools/nx-container:build",
+      "dependsOn": [
+        "build"
+      ],
+      "options": {
+        "context": "{projectRoot}",
+        "dockerfile": "{projectRoot}/Dockerfile",
+        "engine": "docker",
+        "metadata": {
+          "images": [
+            "{projectName}"
+          ],
+          "push": true,
+          "tags": [
+            "type=schedule",
+            "type=ref,event=branch",
+            "type=ref,event=tag",
+            "type=ref,event=pr",
+            "type=sha,prefix=sha-"
+          ]
+        }
+      }
+    },
     "dev": {
       "dependsOn": ["^build"]
     }