Merge branch 'develop' into develop-jbr25

pom.xml

@@ -21,6 +21,7 @@
 		<!-- The version of the JetBrains JDK -->
 		<!-- See: https://github.com/JetBrains/JetBrainsRuntime/releases -->
 		<jbr.version>25.0.3</jbr.version>
+		<jbr.majorVersion>25</jbr.majorVersion>
 		<jbr.buildNumber>480.61</jbr.buildNumber>
 		<jbr.basename>jbr_jcef-${jbr.version}-linux-x64-b${jbr.buildNumber}</jbr.basename>
 		<jbr.filename>${jbr.basename}.tar.gz</jbr.filename>
@@ -76,6 +77,9 @@
 							<build>
 								<contextDir>${project.build.directory}/resources</contextDir>
 								<dockerFile>${project.basedir}/Containerfile</dockerFile>
+								<tags>
+									<tag>${hotswap.version}-jbr${jbr.majorVersion}</tag>
+								</tags>
 							</build>
 						</image>
 					</images>