diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b0707628..81ac56b8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -61,8 +61,6 @@ jobs: targets: publish-docker parallel: 2 args: -- "${{ steps.docker-metadata.outputs.tags }}" "${{ steps.docker-metadata.outputs.labels }}" - env: - DOCKER_BUILDKIT: "1" publish-maven: runs-on: ubuntu-latest diff --git a/nx.json b/nx.json index f68150a1..ca01df48 100644 --- a/nx.json +++ b/nx.json @@ -12,8 +12,17 @@ "{workspaceRoot}/settings.gradle", "{projectRoot}/build.gradle", "{projectRoot}/gradle.properties" + ], + "docker:dependencies": [ + "{workspaceRoot}/scripts/publish_docker.sh", + "{projectRoot}/Dockerfile" ] }, + "targetDefaults": { + "publish-docker": { + "inputs": ["default", "docker:dependencies"] + } + }, "tasksRunnerOptions": { "default": { "runner": "nx/tasks-runners/default", diff --git a/scripts/publish_docker.sh b/scripts/publish_docker.sh index 8ffe6afa..735d70ff 100644 --- a/scripts/publish_docker.sh +++ b/scripts/publish_docker.sh @@ -13,7 +13,7 @@ if [ "${labels}" != "" ]; then labels_params="--label $(echo "${labels}" | sed "s/;;;/ --label /g")" fi -docker build \ +docker buildx build \ --file "apps/${app}/Dockerfile" \ --push \ ${tags_params} \