Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Security problems in packages #825

Merged
merged 2 commits into from
Feb 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
registry=https://registry.npm.taobao.org
package-lock=false
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:

language: node_js

node_js: '9'
node_js: 8

env:
SKIP_SASS_BINARY_DOWNLOAD_FOR_CI=true
Expand Down
22 changes: 8 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,30 @@

## Installation

Using `git`:
### Using git

We prefer using `yarn` as our package manager, see [How to install requsites](./docs/install.md)

```
git clone https://github.com/openpitrix/dashboard.git
cd dashboard
npm install
npm run dev
yarn
yarn dev
```

Using `docker`:
### Using docker

```
docker pull openpitrix/dashboard
docker run -d --name openpitrix-dashborad -p 8000:8000 openpitrix/dashboard
docker run -d --name openpitrix-dashborad -p 80:8000 openpitrix/dashboard
```

Then open your browser: `http://localhost:8000`
Then open your browser: `http://localhost`

## Quick start

* [Deploy wordpress on QingCloud using openpitrix](./docs/quick-start.md)

## Documentation

* [How to install requsites](./docs/install.md)

## Contributing

* [Code of Conduct](./CODE_OF_CONDUCT.md)
* [Contributing Guide](./CONTRIBUTING.md)

## License

Expand Down
12 changes: 9 additions & 3 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,29 @@ See [https://nodejs.org](https://nodejs.org)

## Install yarn (optional)

### 1. install yarn using local tar file
### - install yarn using npm

```bash
npm i yarn -g
```

### - install yarn using local tar file
> without hitting internet on every build, good for local dev

```shell
ADD docker/yarn.tar.gz /opt/
ENV PATH "$PATH:/opt/yarn-v1.5.1/bin"
```

### 2. install yarn using official shell
### - install yarn using official shell
> need curl files on every build, will set yarn include path automatically

```shell
RUN curl -o- -L https://yarnpkg.com/install.sh | bash
ENV PATH "$PATH:$HOME/.yarn/bin"
```

### 3. install yarn using apt-get
### - install yarn using apt-get
> need modify linux distro's source.list, more complex
> for example: on `debian` machine

Expand Down
Loading