From 12e0c5a1e785f1afb4e07e637216c743a3d479e8 Mon Sep 17 00:00:00 2001 From: Gabriel-Trintinalia Date: Tue, 13 Aug 2024 14:49:45 +1000 Subject: [PATCH 1/2] push docker image Signed-off-by: Gabriel-Trintinalia --- gradle/docker.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/docker.gradle b/gradle/docker.gradle index f5dec18..090cf93 100644 --- a/gradle/docker.gradle +++ b/gradle/docker.gradle @@ -49,14 +49,14 @@ tasks.register('distDocker') { exec { def image = "${dockerImageName}:${dockerBuildVersion}" def dockerPlatform = "" - if (project.hasProperty('docker-platform')) { + if (project.hasProperty('docker-platform')){ dockerPlatform = "--platform ${project.getProperty('docker-platform')}" println "Building for platform ${project.getProperty('docker-platform')}" } def gitDetails = getGitCommitDetails(7) executable shell workingDir dockerBuildDir - args "-c", "docker build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${gitDetails.hash} -t ${image} ." + args "-c", "docker buildx build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${gitDetails.hash} -t ${image} --push ." } } } From d747fc231d33ad5c97d76fec9f428d0625654801 Mon Sep 17 00:00:00 2001 From: Gabriel-Trintinalia Date: Tue, 13 Aug 2024 14:51:06 +1000 Subject: [PATCH 2/2] Pass docker name as secret Signed-off-by: Gabriel-Trintinalia --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 6027f63..a8c107f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -45,4 +45,4 @@ jobs: - name: Build and Publish Docker Image run: | - ./gradlew -Pdocker-platform=linux/arm64 distDocker + ./gradlew -PdockerOrgName=${{ secrets.DOCKER_ORG_NAME }} -Pdocker-platform=linux/arm64 distDocker