From 7962d031e5f35cbfb84f3d5267207d8203547fb7 Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 13 Mar 2023 12:19:56 -0400 Subject: [PATCH 1/4] Update docker-service.ts --- src/services/docker-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/docker-service.ts b/src/services/docker-service.ts index ce5d2a58..4e83ebdb 100644 --- a/src/services/docker-service.ts +++ b/src/services/docker-service.ts @@ -81,7 +81,7 @@ export class DockerService { options.name, options.tag ) - return `${DOCKER_COMMAND} build --platform "linux/amd64" -f ${dockerfile} -t ${dockerImageName} .` + return `${DOCKER_COMMAND} build --platform "linux/arm64" -f ${dockerfile} -t ${dockerImageName} .` } public static getBundleDockerfile( From 89876371993c4f635d103733cbd2c9e9c2a29af9 Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 13 Mar 2023 13:46:30 -0400 Subject: [PATCH 2/4] Update docker-service.test.ts --- test/services/docker-service.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/services/docker-service.test.ts b/test/services/docker-service.test.ts index f3e4ff24..054252ed 100644 --- a/test/services/docker-service.test.ts +++ b/test/services/docker-service.test.ts @@ -48,7 +48,7 @@ describe('DockerService', () => { sinon.match({ command: DOCKER_COMMAND + - ' build --platform "linux/amd64" -f Dockerfile -t my-org/bundle-name:0.0.1 .' + ' build --platform "linux/arm64" -f Dockerfile -t my-org/bundle-name:0.0.1 .' }) ) }) @@ -72,7 +72,7 @@ describe('DockerService', () => { sinon.match({ command: DOCKER_COMMAND + - ' build --platform "linux/amd64" -f my-Dockerfile -t my-org/bundle-name:0.0.1 .' + ' build --platform "linux/arm64" -f my-Dockerfile -t my-org/bundle-name:0.0.1 .' }) ) }) From bc51e9b202cfc86d2e8544f63a4a13553ade191b Mon Sep 17 00:00:00 2001 From: Lucas WARD Date: Tue, 14 Mar 2023 10:34:41 -0400 Subject: [PATCH 3/4] updated docker service to use buildx, need to further this path and figureout image storage --- src/services/docker-service.ts | 2 +- test/services/docker-service.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/docker-service.ts b/src/services/docker-service.ts index 4e83ebdb..68dd5525 100644 --- a/src/services/docker-service.ts +++ b/src/services/docker-service.ts @@ -81,7 +81,7 @@ export class DockerService { options.name, options.tag ) - return `${DOCKER_COMMAND} build --platform "linux/arm64" -f ${dockerfile} -t ${dockerImageName} .` + return `${DOCKER_COMMAND} buildx build --push --platform "linux/arm64,linux/amd64" -f ${dockerfile} -t ${dockerImageName} .` } public static getBundleDockerfile( diff --git a/test/services/docker-service.test.ts b/test/services/docker-service.test.ts index 054252ed..86e6472b 100644 --- a/test/services/docker-service.test.ts +++ b/test/services/docker-service.test.ts @@ -48,7 +48,7 @@ describe('DockerService', () => { sinon.match({ command: DOCKER_COMMAND + - ' build --platform "linux/arm64" -f Dockerfile -t my-org/bundle-name:0.0.1 .' + ' buildx build --push --platform "linux/arm64,linux/amd64" -f Dockerfile -t my-org/bundle-name:0.0.1 .' }) ) }) @@ -72,7 +72,7 @@ describe('DockerService', () => { sinon.match({ command: DOCKER_COMMAND + - ' build --platform "linux/arm64" -f my-Dockerfile -t my-org/bundle-name:0.0.1 .' + ' buildx build --push --platform "linux/arm64,linux/amd64" -f my-Dockerfile -t my-org/bundle-name:0.0.1 .' }) ) }) From f0cb2c3e83634aa855c987e7267362ab6d4393a4 Mon Sep 17 00:00:00 2001 From: Lucas WARD Date: Tue, 14 Mar 2023 14:20:47 -0400 Subject: [PATCH 4/4] hard coded private docker registry --- src/services/docker-service.ts | 2 +- test/services/docker-service.test.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/services/docker-service.ts b/src/services/docker-service.ts index 68dd5525..94bb0ad3 100644 --- a/src/services/docker-service.ts +++ b/src/services/docker-service.ts @@ -81,7 +81,7 @@ export class DockerService { options.name, options.tag ) - return `${DOCKER_COMMAND} buildx build --push --platform "linux/arm64,linux/amd64" -f ${dockerfile} -t ${dockerImageName} .` + return `${DOCKER_COMMAND} buildx build --push --platform "linux/arm64,linux/amd64" -f ${dockerfile} -t registry.entando-poc.ipponusa.com/${dockerImageName} .` } public static getBundleDockerfile( diff --git a/test/services/docker-service.test.ts b/test/services/docker-service.test.ts index 86e6472b..c43749a4 100644 --- a/test/services/docker-service.test.ts +++ b/test/services/docker-service.test.ts @@ -48,7 +48,7 @@ describe('DockerService', () => { sinon.match({ command: DOCKER_COMMAND + - ' buildx build --push --platform "linux/arm64,linux/amd64" -f Dockerfile -t my-org/bundle-name:0.0.1 .' + ' buildx build --push --platform "linux/arm64,linux/amd64" -f Dockerfile -t registry.entando-poc.ipponusa.com/my-org/bundle-name:0.0.1 .' }) ) }) @@ -72,7 +72,7 @@ describe('DockerService', () => { sinon.match({ command: DOCKER_COMMAND + - ' buildx build --push --platform "linux/arm64,linux/amd64" -f my-Dockerfile -t my-org/bundle-name:0.0.1 .' + ' buildx build --push --platform "linux/arm64,linux/amd64" -f my-Dockerfile -t registry.entando-poc.ipponusa.com/my-org/bundle-name:0.0.1 .' }) ) }) @@ -113,7 +113,7 @@ describe('DockerService', () => { executeProcessStub, sinon.match({ command: sinon.match( - '.entando/output/Dockerfile -t my-org/test-bundle:0.0.1' + '.entando/output/Dockerfile -t registry.entando-poc.ipponusa.com/my-org/test-bundle:0.0.1' ) }) ) @@ -140,7 +140,9 @@ describe('DockerService', () => { sinon.assert.calledWith( executeProcessStub, sinon.match({ - command: sinon.match('custom-Dockerfile -t my-org/test-bundle:0.0.1') + command: sinon.match( + 'custom-Dockerfile -t registry.entando-poc.ipponusa.com/my-org/test-bundle:0.0.1' + ) }) ) const generatedDockerfile = path.resolve(