[#146] Made handling of NFSRODS version bumps easier.

irods · Jan 26, 2022 · 3375444 · 3375444
1 parent 6fb0df0
commit 3375444
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,8 +16,8 @@ RUN DEBIAN_FRONTEND=noninteractive \
 # This keeps log4j quiet when instructing the container to print the SHA.
 ADD irods-vfs-impl/config/log4j.properties /nfsrods_config/log4j.properties
 
-ADD nfsrods-2.0.0-jar-with-dependencies.jar start.sh /
-RUN chmod +x start.sh
+ADD nfsrods.jar start.sh /
+RUN chmod u+x start.sh
 
 ENV NFSRODS_CONFIG_HOME=/nfsrods_config
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
-        image: local/nfsrods:2.0.0
+        image: local/nfsrods:2
         ports:
             - "2049:2049"
         volumes:

diff --git a/irods-vfs-impl/pom.xml b/irods-vfs-impl/pom.xml
@@ -266,16 +266,7 @@
 
 				<configuration>
 					<artifactItems>
-						<artifactItem>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}</artifactId>
-							<version>${project.version}</version>
-							<type>${project.packaging}</type>
-							<overWrite>true</overWrite>
-							<outputDirectory>${project.basedir}/..</outputDirectory>
-<!-- 							<destFileName>nfsrods</destFileName> -->
-						</artifactItem>
-
+						<!-- Copies the nfsrods JAR file (bundled w/ its dependencies) to the project root. -->
 						<artifactItem>
 							<groupId>${project.groupId}</groupId>
 							<artifactId>${project.artifactId}</artifactId>
@@ -284,7 +275,7 @@
 							<type>${project.packaging}</type>
 							<overWrite>true</overWrite>
 							<outputDirectory>${project.basedir}/..</outputDirectory>
-<!-- 							<destFileName>nfsrods</destFileName> -->
+							<destFileName>nfsrods.jar</destFileName>
 						</artifactItem>
 					</artifactItems>
 				</configuration>

diff --git a/start.sh b/start.sh
@@ -22,4 +22,4 @@ exec java \
     -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \
     -Dlog4j2.configurationFile=$NFSRODS_CONFIG_HOME/log4j.properties \
     -Dlog4j.shutdownHookEnabled=false \
-    -jar /nfsrods-2.0.4-jar-with-dependencies.jar "$@"
+    -jar /nfsrods.jar "$@"