Docker issues #104
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1 +1,12 @@ | ||||||
| .git | ||||||
| .gitignore | ||||||
| Dockerfile | ||||||
| lib | ||||||
| node_modules | ||||||
| **/dist | ||||||
| **/out | ||||||
| .DS_Store | ||||||
| *.DS_Store | ||||||
|
There was a problem hiding this comment. why an additional starred .DS_Store?
Suggested change
|
||||||
| release | ||||||
| **/yarn-error.log | ||||||
|
There was a problem hiding this comment. Shouldn't any logs be ignored?
Suggested change
|
||||||
| **/node_modules | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,45 @@ | ||
| FROM node:8.15.0 | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| libxkbfile-dev \ | ||
| libsecret-1-dev | ||
|
|
||
| WORKDIR /src | ||
| COPY . . | ||
|
|
||
| # This takes ages and always dies in the end. :( | ||
| # RUN yarn --frozen-lockfile && yarn task build:server:binary | ||
|
|
||
| # Make the debugging easier - and the rebuilds faster | ||
| # and our life happier lets break up the build to sequential parts | ||
| RUN yarn --frozen-lockfile | ||
|
|
||
| RUN yarn task vscode:install | ||
| RUN yarn task build:copy-vscode | ||
| RUN yarn task build:web | ||
| RUN yarn task build:bootstrap-fork | ||
| RUN yarn task build:default-extensions | ||
| RUN yarn task build:server:bundle | ||
| RUN yarn task build:app:browser | ||
| RUN yarn task build:server:binary:package | ||
zerdos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # We deploy with ubuntu so that devs have a familiar environemnt. | ||
| FROM ubuntu:18.10 | ||
| WORKDIR /root/project | ||
|
|
||
| COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server | ||
| EXPOSE 8443 | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| openssl \ | ||
| net-tools | ||
|
|
||
| RUN apt-get install -y locales && \ | ||
| locale-gen en_US.UTF-8 | ||
|
|
||
| # We unfortunately cannot use update-locale because docker will not use the env variables | ||
| # configured in /etc/default/locale so we need to set it manually. | ||
| ENV LANG=en_US.UTF-8 | ||
|
|
||
| # Unfortunately `.` does not work with code-server. | ||
| CMD code-server $PWD | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,8 +6,8 @@ | |
| "description": "Run VS Code remotely.", | ||
| "scripts": { | ||
| "build:rules": "cd ./rules && tsc -p .", | ||
| "packages:install": "cd ./packages && yarn --frozen-lockfile", | ||
| "postinstall": "npm-run-all packages:install build:rules", | ||
|
There was a problem hiding this comment. I want a rationale why the parallel flag have to be removed. |
||
| "start": "cd ./packages/server && yarn start", | ||
| "task": "ts-node -r tsconfig-paths/register build/tasks.ts", | ||
| "test": "cd ./packages && yarn test" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| }, | ||
| "devDependencies": { | ||
| "@types/tar-stream": "^1.6.0", | ||
| "cross-env": "^5.2.0", | ||
|
There was a problem hiding this comment. @kylecarbs why wasn't this here already? There was a problem hiding this comment. I've seen a commit yesterday, which removed the global instal of this packet from travis. There was a problem hiding this comment. This should be fixed now (71abb8d); the scripts directly reference the |
||
| "vscode-textmate": "^4.0.1" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,6 +46,25 @@ bl@^3.0.0: | |
| dependencies: | ||
| readable-stream "^3.0.1" | ||
|
|
||
| cross-env@^5.2.0: | ||
| version "5.2.0" | ||
| resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" | ||
| integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg== | ||
| dependencies: | ||
| cross-spawn "^6.0.5" | ||
| is-windows "^1.0.0" | ||
|
|
||
| cross-spawn@^6.0.5: | ||
| version "6.0.5" | ||
| resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" | ||
| integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== | ||
| dependencies: | ||
| nice-try "^1.0.4" | ||
| path-key "^2.0.1" | ||
| semver "^5.5.0" | ||
| shebang-command "^1.2.0" | ||
| which "^1.2.9" | ||
|
|
||
| emojis-list@^2.0.0: | ||
| version "2.1.0" | ||
| resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" | ||
|
|
@@ -85,6 +104,16 @@ inherits@^2.0.3: | |
| resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" | ||
| integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= | ||
|
|
||
| is-windows@^1.0.0: | ||
| version "1.0.2" | ||
| resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" | ||
| integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== | ||
|
|
||
| isexe@^2.0.0: | ||
| version "2.0.0" | ||
| resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" | ||
| integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= | ||
|
|
||
| json-schema-traverse@^0.4.1: | ||
| version "0.4.1" | ||
| resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" | ||
|
|
@@ -136,6 +165,11 @@ nan@^2.10.0, nan@^2.8.0: | |
| resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" | ||
| integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw== | ||
|
|
||
| nice-try@^1.0.4: | ||
| version "1.0.5" | ||
| resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" | ||
| integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== | ||
|
|
||
| once@^1.4.0: | ||
| version "1.4.0" | ||
| resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" | ||
|
|
@@ -157,6 +191,11 @@ oniguruma@^7.0.0: | |
| dependencies: | ||
| nan "^2.10.0" | ||
|
|
||
| path-key@^2.0.1: | ||
| version "2.0.1" | ||
| resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" | ||
| integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= | ||
|
|
||
| pseudomap@^1.0.2: | ||
| version "1.0.2" | ||
| resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" | ||
|
|
@@ -194,6 +233,23 @@ schema-utils@^0.4.5: | |
| ajv "^6.1.0" | ||
| ajv-keywords "^3.1.0" | ||
|
|
||
| semver@^5.5.0: | ||
| version "5.6.0" | ||
| resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" | ||
| integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== | ||
|
|
||
| shebang-command@^1.2.0: | ||
| version "1.2.0" | ||
| resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" | ||
| integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= | ||
| dependencies: | ||
| shebang-regex "^1.0.0" | ||
|
|
||
| shebang-regex@^1.0.0: | ||
| version "1.0.0" | ||
| resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" | ||
| integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= | ||
|
|
||
| spdlog@^0.7.2: | ||
| version "0.7.2" | ||
| resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.7.2.tgz#9298753d7694b9ee9bbfd7e01ea1e4c6ace1e64d" | ||
|
|
@@ -248,6 +304,13 @@ vscode-textmate@^4.0.1: | |
| dependencies: | ||
| oniguruma "^7.0.0" | ||
|
|
||
| which@^1.2.9: | ||
| version "1.3.1" | ||
| resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" | ||
| integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== | ||
| dependencies: | ||
| isexe "^2.0.0" | ||
|
|
||
| wrappy@1: | ||
| version "1.0.2" | ||
| resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ const doInstall = (pkg: string, path: string): Promise<void> => { | |
| logger.info(`Installing "${pkg}" dependencies...`); | ||
|
|
||
| return new Promise((resolve): void => { | ||
| exec("yarn --frozen-lockfile --network-concurrency 1", { | ||
| cwd: path, | ||
| maxBuffer: 1024 * 1024 * 10, | ||
| }, (error, stdout, stderr) => { | ||
|
|
@@ -41,7 +41,7 @@ const handlePackages = async (dir: string): Promise<void> => { | |
| const pkgDir = join(dir, pkg); | ||
| const pkgJsonPath = join(pkgDir, "package.json"); | ||
| if (existsSync(pkgJsonPath)) { | ||
| const ip = await doInstall(pkg, pkgDir); | ||
kylecarbs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (os.platform() === "win32") { | ||
| await ip; | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we want to not put node_modules into the container?
Right now yarn doesn't use it as a cache but it could in the future. See the comment in the Dockerfile.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we can add it back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://medium.com/@rdsubhas/docker-for-development-common-problems-and-solutions-95b25cae41eb
In linux we have linux binaries, on mac we have mac binaries, on windows we have exe files.
NPM is a hot mess, so node_modules should be git + docker ignored.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure about this? I thought
node_modulesonly contained source code? Not actual binaries.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zerdos is right. Check the folder
node_modules/.bin/. There are modules that build executables in there (thenode-sasspackage is one that comes to mind. I don't think code-server uses it, but there are many other examples).