Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 32f226e

Browse files
committed
Normalize names, deal with debconf warnings, disable git warning for java 12
1 parent 5d0cbb0 commit 32f226e

File tree

22 files changed

+72
-43
lines changed

22 files changed

+72
-43
lines changed

containers/azure-functions-java-8/.devcontainer/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ ENV DEBIAN_FRONTEND=noninteractive
1010
RUN apt-get update \
1111
&& apt-get -y install --no-install-recommends apt-utils 2>&1
1212

13+
# Verify git and needed tools are installed
14+
RUN apt-get -y install \
15+
git \
16+
procps \
17+
curl \
18+
apt-transport-https \
19+
gnupg2 \
20+
lsb-release
21+
1322
# Install dotnet core sdk - See https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/amd64/Dockerfile
1423
# Install .NET CLI dependencies
1524
RUN apt-get install -y --no-install-recommends \
@@ -45,14 +54,6 @@ ENV ASPNETCORE_URLS=http://+:80 \
4554
# Trigger first run experience by running arbitrary cmd to populate local package cache
4655
RUN dotnet help &> /dev/null
4756

48-
# Verify git and needed tools are installed
49-
RUN apt-get -y install \
50-
git \
51-
procps \
52-
curl \
53-
apt-transport-https \
54-
gnupg2 \
55-
lsb-release
5657

5758
# Install Azure Functions and Azure CLI
5859
RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \

containers/java-11/.devcontainer/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55

66
FROM maven:3-jdk-11
77

8-
# Install git, process tools
9-
RUN apt-get update && apt-get -y install git procps curl
8+
# Configure apt
9+
ENV DEBIAN_FRONTEND=noninteractive
10+
RUN apt-get update \
11+
&& apt-get -y install --no-install-recommends apt-utils 2>&1
12+
13+
# Verify git, needed tools installed
14+
RUN apt-get -y install git procps curl
1015

1116
# Install Gradle
1217
ENV GRADLE_HOME /opt/gradle
@@ -23,3 +28,4 @@ RUN curl -SL --output gradle.zip "https://services.gradle.org/distributions/grad
2328
RUN apt-get autoremove -y \
2429
&& apt-get clean -y \
2530
&& rm -rf /var/lib/apt/lists/*
31+
ENV DEBIAN_FRONTEND=dialog

containers/java-11/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Summary
44

5-
*Develop Java applications. Includes the JDK 11, Maven and Gradle build tools.*
5+
*Develop Java 11 applications. Includes the JDK 11, Maven, and Gradle build tools.*
66

77
| Metadata | Value |
88
|----------|-------|

containers/java-12/.devcontainer/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55

66
FROM maven:3-jdk-12
77

8-
# Install git, process tools
9-
RUN yum update -y && yum install -y git procps unzip
8+
# Add a setting to disable the out of date git warning. Unfortunatley, openJDK
9+
# Docker images use Oracle SE Linux which has an outdated version of git (<2.0).
10+
COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
11+
12+
# Verify git, needed tools installed
13+
RUN yum install -y git curl procps unzip
1014

1115
# Install Gradle
1216
ENV GRADLE_HOME /opt/gradle
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"git.ignoreLegacyWarning": true
3+
}

containers/java-12/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Summary
44

5-
*Develop Java applications. Includes the JDK 12, Maven and Gradle build tools.*
5+
*Develop Java 12 applications. Includes JDK 12, Maven, and Gradle build tools.*
66

77
| Metadata | Value |
88
|----------|-------|

containers/java-8-maven/.devcontainer/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

containers/java-8-maven/.devcontainer/devcontainer.json

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#-----------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See LICENSE in the project root for license information.
4+
#-----------------------------------------------------------------------------------------
5+
6+
FROM maven:3-jdk-8
7+
8+
# Configure apt
9+
ENV DEBIAN_FRONTEND=noninteractive
10+
RUN apt-get update \
11+
&& apt-get -y install --no-install-recommends apt-utils 2>&1
12+
13+
# Verify git, needed tools installed
14+
RUN apt-get -y install git procps curl
15+
16+
# Install Gradle
17+
ENV GRADLE_HOME /opt/gradle
18+
ENV GRADLE_VERSION 5.4
19+
ARG GRADLE_DOWNLOAD_SHA256=c8c17574245ecee9ed7fe4f6b593b696d1692d1adbfef425bef9b333e3a0e8de
20+
RUN curl -SL --output gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
21+
&& echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
22+
&& unzip gradle.zip \
23+
&& rm gradle.zip \
24+
&& mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
25+
&& ln -s "${GRADLE_HOME}/bin/gradlec" /usr/bin/gradle
26+
27+
# Clean up
28+
RUN apt-get autoremove -y \
29+
&& apt-get clean -y \
30+
&& rm -rf /var/lib/apt/lists/*
31+
ENV DEBIAN_FRONTEND=dialog
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "Java 8",
3+
"dockerFile": "Dockerfile",
4+
"extensions": [
5+
"vscjava.vscode-java-pack"
6+
]
7+
}

0 commit comments

Comments
 (0)