Handle JAVA_HOME varying between base image versions
This commit is contained in:
		@@ -22,5 +22,8 @@ RUN apt-get autoremove -y \
 | 
			
		||||
    && rm -rf /var/lib/apt/lists/*
 | 
			
		||||
ENV DEBIAN_FRONTEND=dialog
 | 
			
		||||
 | 
			
		||||
# Allow for a consistant java home location for settings - image is changing over time
 | 
			
		||||
RUN if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi
 | 
			
		||||
 | 
			
		||||
# Set the default shell to bash rather than sh
 | 
			
		||||
ENV SHELL /bin/bash
 | 
			
		||||
 
 | 
			
		||||
@@ -4,5 +4,8 @@
 | 
			
		||||
	"extensions": [
 | 
			
		||||
		"vscjava.vscode-java-pack",
 | 
			
		||||
		"redhat.vscode-xml"
 | 
			
		||||
	]
 | 
			
		||||
	],
 | 
			
		||||
	"settings":{
 | 
			
		||||
		"java.home": "/docker-java-home"
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
{
 | 
			
		||||
    "java.home": "/usr/local/openjdk-8"
 | 
			
		||||
    "java.home": "/docker-java-home"
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user