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

Commit 70f04ab

Browse files
committed
Python updates
- remove default port mapping - remove libicu (no longer needed) - update python2 container to match others
1 parent 24ada53 commit 70f04ab

File tree

9 files changed

+8
-28
lines changed

9 files changed

+8
-28
lines changed

containers/python-2/.devcontainer/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
# Licensed under the MIT License. See LICENSE in the project root for license information.
44
#-----------------------------------------------------------------------------------------
55

6-
FROM python:2-slim
6+
FROM python:2
77

88
# Copy endpoint specific user settings overrides into container to specify Python path
9-
COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
9+
COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
1010

1111
RUN pip install pylint
1212

1313
# Install git, process tools
1414
RUN apt-get update && apt-get -y install git procps
1515

16-
# Install any missing dependencies for enhanced language service
17-
RUN apt-get install -y libicu57
16+
# Install Python dependencies from requirements.txt if it exists
17+
COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
18+
RUN if [ -f "requirements.txt" ]; then pip install -r requirements.txt && rm requirements.txt*; fi
1819

1920
# Clean up
2021
RUN apt-get autoremove -y \
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"name": "Python 2",
3+
"context": "..",
34
"dockerFile": "Dockerfile",
5+
"workspaceFolder": "/workspace",
46
"extensions": [
57
"ms-python.python",
6-
"LittleFoxTeam.vscode-python-test-adapter"
8+
"VisualStudioExptTeam.vscodeintellicode"
79
]
810
}

containers/python-2/.devcontainer/requirements.txt.temp

Whitespace-only changes.

containers/python-3-anaconda/.devcontainer/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@ COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settin
1111
# Install git, process tools
1212
RUN apt-get update && apt-get -y install git procps
1313

14-
# Install any missing dependencies for enhanced language service
15-
RUN apt-get install -y libicu[0-9][0-9]
16-
1714
RUN mkdir /workspace
1815
WORKDIR /workspace
1916

2017
# Install Python dependencies from requirements.txt if it exists
2118
COPY .devcontainer/environment.yml.temp environment.yml* /workspace/
2219
RUN if [ -f "environment.yml" ]; then conda env update base -f environment.yml && rm environment.yml*; fi
2320

24-
# Expose port 5000 as the default web port
25-
EXPOSE 5000
26-
2721
# Clean up
2822
RUN apt-get autoremove -y \
2923
&& apt-get clean -y \

containers/python-3-miniconda/.devcontainer/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@ COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settin
1111
# Install git, process tools
1212
RUN apt-get update && apt-get -y install git procps
1313

14-
# Install any missing dependencies for enhanced language service
15-
RUN apt-get install -y libicu[0-9][0-9]
16-
1714
RUN mkdir /workspace
1815
WORKDIR /workspace
1916

2017
# Install Python dependencies from requirements.txt if it exists
2118
COPY .devcontainer/environment.yml.temp environment.yml* /workspace/
2219
RUN if [ -f "environment.yml" ]; then conda env update base -f environment.yml && rm environment.yml*; fi
2320

24-
# Expose port 5000 as the default web port
25-
EXPOSE 5000
26-
2721
# Clean up
2822
RUN apt-get autoremove -y \
2923
&& apt-get clean -y \

containers/python-3-miniconda/.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "Python 3 - Miniconda",
33
"context": "..",
44
"dockerFile": "Dockerfile",
5-
"appPort": "5000:5000",
65
"workspaceFolder": "/workspace",
76
"extensions": [
87
"ms-python.python",

containers/python-3-postgres/.devcontainer/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ WORKDIR /workspace
1616
# Install git, process tools
1717
RUN apt-get update && apt-get -y install git procps
1818

19-
# Install any missing dependencies for enhanced language service
20-
RUN apt-get install -y libicu[0-9][0-9]
21-
2219
# Install Python dependencies from requirements.txt if it exists
2320
COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
2421
RUN if [ -f "requirements.txt" ]; then pip install -r requirements.txt && rm requirements.txt; fi

containers/python-3/.devcontainer/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@ COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settin
1111
# Install git, process tools
1212
RUN apt-get update && apt-get -y install git procps
1313

14-
# Install any missing dependencies for enhanced language service
15-
RUN apt-get install -y libicu[0-9][0-9]
16-
1714
RUN mkdir /workspace
1815
WORKDIR /workspace
1916

2017
# Install Python dependencies from requirements.txt if it exists
2118
COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
2219
RUN if [ -f "requirements.txt" ]; then pip install -r requirements.txt && rm requirements.txt*; fi
2320

24-
# Expose port 5000 as the default web port
25-
EXPOSE 5000
26-
2721
# Clean up
2822
RUN apt-get autoremove -y \
2923
&& apt-get clean -y \

containers/python-3/.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "Python 3",
33
"context": "..",
44
"dockerFile": "Dockerfile",
5-
"appPort": "5000:5000",
65
"workspaceFolder": "/workspace",
76
"extensions": [
87
"ms-python.python",

0 commit comments

Comments
 (0)