Skip to content

Commit ee25034

Browse files
gkalpakatscott
authored andcommitted
build: update the recommended Dockerfile for VSCode remote development (angular#41396)
This commit updates the recommended `Dockerfile` for VSCode remote development to take into account recent changes in our dev workflow (updated Node.js version, vendored yarn, modified CircleCI config). It also adds a note in the CircleCI config to keep the recommended `Dockerfile` up-to-date with the Node.js version used on CI. PR Close angular#41396
1 parent 2cef385 commit ee25034

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ var_10: &only_on_master
6565
# **NOTE 1**: Pin to exact images using an ID (SHA). See https://circleci.com/docs/2.0/circleci-images/#using-a-docker-image-id-to-pin-an-image-to-a-fixed-version.
6666
# (Using the tag in not necessary when pinning by ID, but include it anyway for documentation purposes.)
6767
# **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix.
68+
# **NOTE 3**: If you change the version of Node.js provided by the docker images, also update `.devcontainer/recommended-Dockerfile` to match the new version.
6869
executors:
6970
default-executor:
7071
parameters:
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Image metadata and config.
2-
# Ideally, the image version should be what we use on CI.
3-
# See `executors > browsers-executor` in `.circleci/config.yml`.
4-
FROM circleci/node:10-browsers
5-
2+
# Ideally, the Node.js version should match what we use on CI.
3+
# See `executors > default-executor` in `.circleci/config.yml`.
4+
FROM circleci/node:12-browsers
5+
66

77
LABEL name="Angular dev environment" \
88
description="This image can be used to create a dev environment for building Angular." \
@@ -16,13 +16,9 @@ EXPOSE 4000 4200 4433 5000 8080 9876
1616
USER root
1717

1818

19-
# Configure `Node.js`/`npm` and install utilities.
19+
# Configure `Node.js`/`npm`.
2020
RUN npm config --global set user root
2121

22-
# Ideally, the version should be what we use on CI.
23-
# See `commands > overwrite_yarn` in `.circleci/config.yml`.
24-
RUN npm install --global yarn@latest
25-
2622

2723
# Go! (And keep going.)
2824
CMD ["tail", "--follow", "/dev/null"]

0 commit comments

Comments
 (0)