Consolidate build layers
This commit is contained in:
		@@ -8,19 +8,17 @@ FROM maven:3.6-jdk-8
 | 
				
			|||||||
# Configure apt
 | 
					# Configure apt
 | 
				
			||||||
ENV DEBIAN_FRONTEND=noninteractive
 | 
					ENV DEBIAN_FRONTEND=noninteractive
 | 
				
			||||||
RUN apt-get update \
 | 
					RUN apt-get update \
 | 
				
			||||||
    && apt-get -y install --no-install-recommends apt-utils 2>&1
 | 
					    && apt-get -y install --no-install-recommends apt-utils 2>&1 \
 | 
				
			||||||
 | 
					    #
 | 
				
			||||||
    # Install git, process tools, lsb-release (common in install instructions for CLIs)
 | 
					    # Install git, process tools, lsb-release (common in install instructions for CLIs)
 | 
				
			||||||
RUN apt-get -y install git procps lsb-release
 | 
					    && apt-get -y install git procps lsb-release \
 | 
				
			||||||
 | 
					    #
 | 
				
			||||||
 | 
					    # Allow for a consistant java home location for settings - image is changing over time
 | 
				
			||||||
 | 
					    && if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \
 | 
				
			||||||
 | 
					    #
 | 
				
			||||||
    # Clean up
 | 
					    # Clean up
 | 
				
			||||||
RUN apt-get autoremove -y \
 | 
					    && apt-get autoremove -y \
 | 
				
			||||||
    && apt-get clean -y \
 | 
					    && apt-get clean -y \
 | 
				
			||||||
    && rm -rf /var/lib/apt/lists/*
 | 
					    && rm -rf /var/lib/apt/lists/*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV DEBIAN_FRONTEND=dialog
 | 
					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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,7 @@
 | 
				
			|||||||
		"redhat.vscode-xml"
 | 
							"redhat.vscode-xml"
 | 
				
			||||||
	],
 | 
						],
 | 
				
			||||||
	"settings":{
 | 
						"settings":{
 | 
				
			||||||
		"java.home": "/docker-java-home"
 | 
							"java.home": "/docker-java-home",
 | 
				
			||||||
 | 
							"terminal.integrated.shell.linux": "/bin/bash"
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user