honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update the recommended `Dockerfile` for VSCode remote development (#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 #41396
This commit is contained in:
George Kalpakas 2021-04-01 22:15:44 +03:00 committed by atscott
parent 2cef385e43
commit ee25034a77
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

@ -65,6 +65,7 @@ var_10: &only_on_master
# **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. # **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.
# (Using the tag in not necessary when pinning by ID, but include it anyway for documentation purposes.) # (Using the tag in not necessary when pinning by ID, but include it anyway for documentation purposes.)
# **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix. # **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix.
# **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.
executors: executors:
default-executor: default-executor:
parameters: parameters:

12
.devcontainer/recommended-Dockerfile
View File

@ -1,7 +1,7 @@
# Image metadata and config. # Image metadata and config.
# Ideally, the image version should be what we use on CI. # Ideally, the Node.js version should match what we use on CI.
# See `executors > browsers-executor` in `.circleci/config.yml`. # See `executors > default-executor` in `.circleci/config.yml`.
FROM circleci/node:10-browsers FROM circleci/node:12-browsers
LABEL name="Angular dev environment" \ LABEL name="Angular dev environment" \
@ -16,13 +16,9 @@ EXPOSE 4000 4200 4433 5000 8080 9876
USER root USER root
# Configure `Node.js`/`npm` and install utilities. # Configure `Node.js`/`npm`.
RUN npm config --global set user root RUN npm config --global set user root
# Ideally, the version should be what we use on CI.
# See `commands > overwrite_yarn` in `.circleci/config.yml`.
RUN npm install --global yarn@latest
# Go! (And keep going.) # Go! (And keep going.)
CMD ["tail", "--follow", "/dev/null"] CMD ["tail", "--follow", "/dev/null"]