Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
5d98e78d
Commit
5d98e78d
authored
Nov 10, 2016
by
Bo-Yi Wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert #418 and fix install yarn package management.
Signed-off-by:
Bo-Yi Wu
<
appleboy.tw@gmail.com
>
parent
c5d11163
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
docker-compose.yml
docker-compose.yml
+0
-2
Dockerfile
workspace/Dockerfile
+1
-1
No files found.
docker-compose.yml
View file @
5d98e78d
...
@@ -36,8 +36,6 @@ services:
...
@@ -36,8 +36,6 @@ services:
ports
:
ports
:
-
"
2222:22"
-
"
2222:22"
tty
:
true
tty
:
true
environment
:
-
PATH=$PATH:/home/laradock/.yarn/bin:/var/www/vendor/bin:/home/laradock/.nvm/versions/node/v7.1.0/bin
### PHP-FPM Container #######################################
### PHP-FPM Container #######################################
...
...
workspace/Dockerfile
View file @
5d98e78d
...
@@ -191,7 +191,7 @@ ARG INSTALL_YARN=false
...
@@ -191,7 +191,7 @@ ARG INSTALL_YARN=false
ENV
INSTALL_YARN ${INSTALL_YARN}
ENV
INSTALL_YARN ${INSTALL_YARN}
RUN if
[
${
INSTALL_YARN
}
=
true
]
;
then
\
RUN if
[
${
INSTALL_YARN
}
=
true
]
;
then
\
export
PATH
=
$PATH
:/home/laradock/.nvm/versions/node/v7.1.0/bin
&&
\
[
-s
"
$NVM_DIR
/nvm.sh"
]
&&
.
"
$NVM_DIR
/nvm.sh"
&&
\
curl
-o-
-L
https://yarnpkg.com/install.sh | bash
&&
\
curl
-o-
-L
https://yarnpkg.com/install.sh | bash
&&
\
echo
""
>>
~/.bashrc
&&
\
echo
""
>>
~/.bashrc
&&
\
echo
'export PATH="$HOME/.yarn/bin:$PATH"'
>>
~/.bashrc
\
echo
'export PATH="$HOME/.yarn/bin:$PATH"'
>>
~/.bashrc
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment