Update java definition to use updated scripts
This commit is contained in:
Chuck Lantz
Родитель
202fae4ba5
Коммит
a17e43ac87
|
|
@ -11,42 +11,25 @@ ARG USER_GID=$USER_UID
|
|||
|
||||
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
|
||||
COPY library-scripts/*.sh /tmp/library-scripts/
|
||||
RUN apt-get update \
|
||||
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
|
||||
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
|
||||
RUN /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
|
||||
&& if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \
|
||||
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/common-debian.sh
|
||||
|
||||
# [Optional] Install Maven
|
||||
ARG INSTALL_MAVEN="false"
|
||||
ARG MAVEN_VERSION=3.6.3
|
||||
ARG MAVEN_DOWNLOAD_SHA="dev-mode"
|
||||
ENV MAVEN_HOME /usr/share/maven \
|
||||
MAVEN_CONFIG /root/.m2
|
||||
COPY maven-settings.xml /usr/share/maven/ref/
|
||||
RUN if [ "${INSTALL_MAVEN}" = "true" ]; then \
|
||||
mkdir -p /usr/share/maven /usr/share/maven/ref \
|
||||
&& curl -fsSL -o /tmp/apache-maven.tar.gz https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
|
||||
&& ([ "${MAVEN_DOWNLOAD_SHA}" = "dev-mode" ] || echo "${MAVEN_DOWNLOAD_SHA} */tmp/apache-maven.tar.gz" | sha512sum -c - ) \
|
||||
&& tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
|
||||
&& rm -f /tmp/apache-maven.tar.gz \
|
||||
&& ln -s /usr/share/maven/bin/mvn /usr/bin/mvn; \
|
||||
fi
|
||||
ARG MAVEN_DOWNLOAD_SHA="no-check"
|
||||
ENV MAVEN_HOME=/usr/local/share/maven
|
||||
RUN if [ "${INSTALL_MAVEN}" = "true" ]; then /bin/bash /tmp/library-scripts/maven-debian.sh ${MAVEN_VERSION} ${MAVEN_HOME} ${USERNAME} ${MAVEN_DOWNLOAD_SHA}; fi \
|
||||
&& rm -f /tmp/library-scripts/maven-debian.sh
|
||||
|
||||
# [Optional] Install Gradle
|
||||
ARG INSTALL_GRADLE="false"
|
||||
ARG GRADLE_VERSION=5.4.1
|
||||
ARG GRADLE_DOWNLOAD_SHA="dev-mode"
|
||||
ENV GRADLE_HOME=/opt/gradle
|
||||
RUN if [ "${INSTALL_GRADLE}" = "true" ]; then \
|
||||
curl -sSL --output gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
|
||||
&& ([ "${GRADLE_DOWNLOAD_SHA}" = "dev-mode" ] || echo "${GRADLE_DOWNLOAD_SHA} *gradle.zip" | sha256sum --check - ) \
|
||||
&& unzip gradle.zip \
|
||||
&& rm gradle.zip \
|
||||
&& mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
|
||||
&& ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle; \
|
||||
fi
|
||||
|
||||
# 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
|
||||
ARG GRADLE_DOWNLOAD_SHA="no-check"
|
||||
ENV GRADLE_HOME=/usr/local/share/gradle
|
||||
RUN if [ "${INSTALL_GRADLE}" = "true" ]; then /bin/bash /tmp/library-scripts/gradle-debian.sh ${GRADLE_VERSION} ${GRADLE_HOME} ${USERNAME} ${GRADLE_DOWNLOAD_SHA}; fi \
|
||||
&& rm -f /tmp/library-scripts/gradle-debian.sh
|
||||
|
||||
# [Optional] Install Node.js for use with web applications - update the INSTALL_NODE arg in devcontainer.json to enable.
|
||||
ARG INSTALL_NODE="false"
|
||||
|
|
@ -56,7 +39,7 @@ ENV NVM_SYMLINK_CURRENT=true \
|
|||
PATH=${NVM_DIR}/current/bin:${PATH}
|
||||
COPY library-scripts/node-debian.sh /tmp/library-scripts/
|
||||
RUN if [ "$INSTALL_NODE" = "true" ]; then /bin/bash /tmp/library-scripts/node-debian.sh "${NVM_DIR}" "${NODE_VERSION}" "${USERNAME}"; fi \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/library-scripts
|
||||
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/node-debian.sh
|
||||
|
||||
# [Optional] Uncomment this section to install additional OS packages.
|
||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
#!/usr/bin/env bash
|
||||
#-------------------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
|
||||
#-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
# Syntax: ./gradle-debian.sh <gradle version> [gradle home] [non-root-user] [gradle SHA 256]
|
||||
|
||||
GRADLE_VERSION=$1
|
||||
GRADLE_HOME=${2:-"/usr/local/share/gradle"}
|
||||
USERNAME=${3:-"vscode"}
|
||||
GRADLE_DOWNLOAD_SHA=${4:-"no-check"}
|
||||
|
||||
set -e
|
||||
|
||||
if [ -d "${GRADLE_HOME}" ]; then
|
||||
echo "Gradle already installed."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo -e "Required argument missing.\n\ngradle-debian.sh <gradle version> [gradle home] [non-root-user] [gradle SHA 256]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(id -u)" -ne 0 ]; then
|
||||
echo -e 'Script must be run a root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Treat a user name of "none" or non-existant user as root
|
||||
if [ "${USERNAME}" = "none" ] && ! id -u ${USERNAME} > /dev/null 2>&1; then
|
||||
USERNAME=root
|
||||
fi
|
||||
|
||||
# Install curl, apt-get dependencies if missing
|
||||
if ! type curl > /dev/null 2>&1; then
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
|
||||
apt-get update
|
||||
fi
|
||||
apt-get -y install --no-install-recommends ca-certificates curl gnupg2
|
||||
fi
|
||||
|
||||
# Function to su if user exists and is not root
|
||||
suIf() {
|
||||
if [ "${USERNAME}" != "root" ]; then
|
||||
su ${USERNAME} -c "$@"
|
||||
else
|
||||
"$@"
|
||||
fi
|
||||
}
|
||||
|
||||
# Install Gradle
|
||||
echo "Downloading Gradle..."
|
||||
suIf "$(cat \
|
||||
<< EOF
|
||||
mkdir -p /tmp/downloads
|
||||
curl -sSL --output /tmp/downloads/archive-gradle.zip https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip
|
||||
([ "${GRADLE_DOWNLOAD_SHA}" = "no-check" ] || echo "${GRADLE_DOWNLOAD_SHA} */tmp/downloads/archive-gradle.zip" | sha256sum --check - )
|
||||
unzip -q /tmp/downloads/archive-gradle.zip -d /tmp/downloads/
|
||||
EOF
|
||||
)"
|
||||
mv -f /tmp/downloads/gradle* ${GRADLE_HOME}
|
||||
chown ${USERNAME}:root ${GRADLE_HOME}
|
||||
ln -s ${GRADLE_HOME}/bin/gradle /usr/local/bin/gradle
|
||||
rm -rf /tmp/downloads
|
||||
echo "Done."
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
#!/usr/bin/env bash
|
||||
#-------------------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
|
||||
#-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
# Syntax: ./maven-debian.sh <maven version> [maven home] [non-root user] [maven SHA 512]
|
||||
|
||||
MAVEN_VERSION=$1
|
||||
MAVEN_HOME=${2:-"/usr/local/share/maven"}
|
||||
USERNAME=${3:-"vscode"}
|
||||
MAVEN_DOWNLOAD_SHA=${4:-"no-check"}
|
||||
|
||||
set -e
|
||||
|
||||
if [ -d "${MAVEN_HOME}" ]; then
|
||||
echo "Maven already installed."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo -e "Required argument missing.\n\nmaven-debian.sh <maven version> [maven home] [non-root user] [maven SHA 512]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(id -u)" -ne 0 ]; then
|
||||
echo -e 'Script must be run a root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Treat a user name of "none" or non-existant user as root
|
||||
if [ "${USERNAME}" = "none" ] && ! id -u ${USERNAME} > /dev/null 2>&1; then
|
||||
USERNAME=root
|
||||
fi
|
||||
|
||||
# Install curl, apt-get dependencies if missing
|
||||
if ! type curl > /dev/null 2>&1; then
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
|
||||
apt-get update
|
||||
fi
|
||||
apt-get -y install --no-install-recommends ca-certificates curl gnupg2
|
||||
fi
|
||||
|
||||
# Function to su if user exists and is not root
|
||||
suIf() {
|
||||
if [ "${USERNAME}" != "root" ]; then
|
||||
su ${USERNAME} -c "$@"
|
||||
else
|
||||
"$@"
|
||||
fi
|
||||
}
|
||||
|
||||
# Creat folder, add maven settings
|
||||
mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref
|
||||
tee ${MAVEN_HOME}/ref/maven-settings.xml > /dev/null \
|
||||
<< EOF
|
||||
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
|
||||
<localRepository>${MAVEN_HOME}/ref/repository</localRepository>
|
||||
</settings>
|
||||
EOF
|
||||
chown -R ${USERNAME}:root ${MAVEN_HOME}
|
||||
|
||||
# Install Maven
|
||||
echo "Downloading Maven..."
|
||||
suIf "$(cat \
|
||||
<< EOF
|
||||
curl -fsSL -o /tmp/maven.tar.gz https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
|
||||
([ "${MAVEN_DOWNLOAD_SHA}" = "dev-mode" ] || echo "${MAVEN_DOWNLOAD_SHA} */tmp/maven.tar.gz" | sha512sum -c - )
|
||||
tar -xzf /tmp/maven.tar.gz -C ${MAVEN_HOME} --strip-components=1
|
||||
rm -f /tmp/maven.tar.gz
|
||||
EOF
|
||||
)"
|
||||
ln -s ${MAVEN_HOME}/bin/mvn /usr/local/bin/mvn
|
||||
echo "Done."
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
|
||||
https://maven.apache.org/xsd/settings-1.0.0.xsd">
|
||||
<localRepository>/usr/share/maven/ref/repository</localRepository>
|
||||
</settings>
|
||||
|
|
@ -98,8 +98,6 @@ Given how frequently web applications use Node.js for front end code, this conta
|
|||
|
||||
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
|
||||
|
||||
6. If you want to include maven or gradle build tools into your dev container, please uncomment the corresponding steps from the `containers/java-11/.devcontainer/Dockerfile`, and run **Remote-Containers: Rebuild Container** to rebuild the dev container.
|
||||
|
||||
## Testing the definition
|
||||
|
||||
This definition includes some test code that will help you verify it is working as expected on your system. Follow these steps:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче