always use currentArch for tests

philiplehmann · Dec 15, 2024 · e071f85 · e071f85
1 parent 14932fe
commit e071f85
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 61 deletions.
diff --git a/apps/mailcatcher/project.json b/apps/mailcatcher/project.json
@@ -30,10 +30,6 @@
     "docker-test": {
       "executor": "@container/docker:test",
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/mailcatcher:test",
         "file": "apps/mailcatcher/Dockerfile"
       }

diff --git a/apps/maildev/project.json b/apps/maildev/project.json
@@ -30,10 +30,6 @@
     "docker-test": {
       "executor": "@container/docker:test",
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/maildev:test",
         "file": "apps/maildev/Dockerfile"
       }

diff --git a/apps/mailhog/project.json b/apps/mailhog/project.json
@@ -30,10 +30,6 @@
     "docker-test": {
       "executor": "@container/docker:test",
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/mailhog:test",
         "file": "apps/mailhog/Dockerfile"
       }

diff --git a/apps/pdftk/project.json b/apps/pdftk/project.json
@@ -98,10 +98,6 @@
         "build"
       ],
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/pdftk:test",
         "file": "apps/pdftk/Dockerfile"
       }

diff --git a/apps/poppler/project.json b/apps/poppler/project.json
@@ -87,10 +87,6 @@
         "build"
       ],
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/poppler-server:test",
         "file": "apps/poppler/Dockerfile"
       }

diff --git a/apps/puppeteer/project.json b/apps/puppeteer/project.json
@@ -135,10 +135,6 @@
         "build"
       ],
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/puppeteer:test",
         "file": "apps/puppeteer/Dockerfile"
       }

diff --git a/apps/tesseract/project.json b/apps/tesseract/project.json
@@ -86,10 +86,6 @@
         "build"
       ],
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/tesseract:test",
         "file": "apps/tesseract/Dockerfile"
       }

diff --git a/apps/unoserver/project.json b/apps/unoserver/project.json
@@ -100,10 +100,6 @@
         "build"
       ],
       "options": {
-        "platforms": [
-          "amd64",
-          "arm64"
-        ],
         "tag": "philiplehmann/unoserver:test",
         "file": "apps/unoserver/Dockerfile"
       }

diff --git a/libs/docker/src/executors/test/executor.ts b/libs/docker/src/executors/test/executor.ts
@@ -2,32 +2,28 @@ import type { DockerTestExecutorSchema } from './schema';
 import { dockerBuildxBuild } from '../../docker-buildx-build';
 import { dockerImageRemove } from '../../docker-image-remove';
 import type { Executor } from '@nx/devkit';
+import { currentArch } from '../../docker-helper';
 
-const runExecutor: Executor<DockerTestExecutorSchema> = async ({
-  file,
-  tag,
-  platforms,
-}): Promise<{ success: boolean }> => {
-  const promises = await Promise.allSettled(
-    platforms.map(async (platform) => {
-      const tagWithPlatform = `${tag}-${platform}`;
-      await dockerImageRemove(tagWithPlatform);
-      await dockerBuildxBuild({
-        platforms: [platform],
-        output: 'load',
-        file,
-        tags: [tagWithPlatform],
-      });
-    }),
-  );
-  if (promises.some((promise) => promise.status === 'rejected')) {
+const runExecutor: Executor<DockerTestExecutorSchema> = async ({ file, tag }): Promise<{ success: boolean }> => {
+  try {
+    const platform = currentArch();
+    const tagWithPlatform = `${tag}-${platform}`;
+    await dockerImageRemove(tagWithPlatform);
+    await dockerBuildxBuild({
+      platforms: [platform],
+      output: 'load',
+      file,
+      tags: [tagWithPlatform],
+    });
+    return {
+      success: true,
+    };
+  } catch (error) {
+    console.error(error);
     return {
       success: false,
     };
   }
-  return {
-    success: true,
-  };
 };
 
 export default runExecutor;
diff --git a/libs/docker/src/executors/test/schema.d.ts b/libs/docker/src/executors/test/schema.d.ts
@@ -1,7 +1,6 @@
 import type { DockerPlatform } from '../../docker-helper';
 
 export interface DockerTestExecutorSchema {
-  platforms: DockerPlatform[];
   tag: string;
   file: string;
 }
diff --git a/libs/docker/src/executors/test/schema.json b/libs/docker/src/executors/test/schema.json
@@ -8,15 +8,9 @@
     "tag": {
       "type": "string"
     },
-    "platforms": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
     "file": {
       "type": "string"
     }
   },
   "required": []
-}
+}