From 03681fc79fb467483738051d6172890adf32fbb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 04:01:55 +0000
Subject: [PATCH 1/2] build(deps): bump docker-maven-plugin from 0.42.1 to
 0.43.0

Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.42.1 to 0.43.0.
- [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases)
- [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md)
- [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.42.1...v0.43.0)

---
updated-dependencies:
- dependency-name: io.fabric8:docker-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 exist-docker/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-docker/pom.xml b/exist-docker/pom.xml
index 9ee27ef9a76..3f0ce01d255 100644
--- a/exist-docker/pom.xml
+++ b/exist-docker/pom.xml
@@ -208,7 +208,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.42.1</version>
+                <version>0.43.0</version>
                 <configuration>
                   <verbose>true</verbose>
                     <images>

From 889d36f214dabf86b37bdff6dc15eae75946fe1f Mon Sep 17 00:00:00 2001
From: duncdrum <d.paterson@me.com>
Date: Tue, 9 May 2023 21:24:24 +0200
Subject: [PATCH 2/2] [refactor] Dockerfile: cleanup builder

inline experimental
---
 .github/workflows/ci-deploy.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
index 2dd87883acb..6c09afe3415 100644
--- a/.github/workflows/ci-deploy.yml
+++ b/.github/workflows/ci-deploy.yml
@@ -60,12 +60,12 @@ jobs:
         run: mvn -q -Ddocker.tag=release -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
         working-directory: ./exist-docker
       # NOTE (DP): This is for debugging, publishes an experimental image from inside PRs against develop
-      - name: Publish experimental images
-        if: github.base_ref == 'develop'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: mvn -q -Ddocker.tag=experimental -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
-        working-directory: ./exist-docker  
+      # - name: Publish experimental images
+      #   if: github.base_ref == 'develop'
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      #     DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      #   run: mvn -q -Ddocker.tag=experimental -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
+      #   working-directory: ./exist-docker