QPID-8352: [Broker-J] Official Docker image for Broker-J

apache · Nov 13, 2023 · 77a06a8 · 77a06a8
1 parent 622671c
commit 77a06a8
Show file tree

Hide file tree

Showing 13 changed files with 1,166 additions and 1 deletion.
diff --git a/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java b/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
@@ -62,7 +62,11 @@ public void writeFileSafely(Path targetFile, Path backupFile, Path tmpFile, Base
 
         if (permissions != null)
         {
-            Files.setPosixFilePermissions(backupFile, permissions);
+            final Set<PosixFilePermission> backupPermissions = Files.getPosixFilePermissions(backupFile);
+            if (!backupPermissions.equals(permissions))
+            {
+                Files.setPosixFilePermissions(backupFile, permissions);
+            }
         }
 
         atomicFileMoveOrReplace(tmpFile, targetFile);

diff --git a/doc/developer-guide/src/main/markdown/release-instructions.md b/doc/developer-guide/src/main/markdown/release-instructions.md
@@ -183,3 +183,4 @@ Sources are kept in a Git repository. Thus a git client is required.
 14. Remove the previous release binaries from <https://dist.apache.org/repos/dist/release/qpid/broker-j>
     when a new one is announced.
 15. Update jenkins jobs if required.
+16. Docker images can be build and pushed to the container registry according to the qpid-docker [README.md](https://github.com/apache/qpid-broker-j/tree/main/qpid-docker#readme).
diff --git a/doc/java-broker/src/docbkx/Apache-Qpid-Broker-J-Book.xml b/doc/java-broker/src/docbkx/Apache-Qpid-Broker-J-Book.xml
@@ -42,4 +42,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Appendix-Miscellaneous.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Appendix-Queue-Declaration-Arguments.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Docker.xml"/>
 </book>