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.

Sign up for GitHub

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

Jump to bottom

dev: remove nginx #13299

Merged
merged 7 commits into from
Feb 18, 2021
Merged

dev: remove nginx #13299

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
374674b
dev: remove nginx
keegancsmith Aug 24, 2020
a17c1af
dev: use caddy 2.3.0
keegancsmith Feb 16, 2021
76bc87d
Merge remote-tracking branch 'origin/main' into k/dev-rm-nginx
keegancsmith Feb 16, 2021
d7d9b1d
Merge branch 'k/caddy-upgrade' into k/dev-rm-nginx
keegancsmith Feb 16, 2021
97c9b9b
caddyfile works on 2.3.0
keegancsmith Feb 16, 2021
7d6bfe7
Merge remote-tracking branch 'origin/main' into k/dev-rm-nginx
keegancsmith Feb 18, 2021
2cf5028
doc: remove more references to nginx in dev
keegancsmith Feb 18, 2021
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
Prev Previous commit
doc: remove more references to nginx in dev
  • Loading branch information
@keegancsmith
keegancsmith committed Feb 18, 2021
commit 2cf5028d9a41b4907ffaf772d677b4c2d137922e
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
- Node.js (version 8 or 10)
- Redis
- Yarn
- Nginx

For a detailed guide to installing prerequisites, see [these
instructions](doc/dev/getting-started/quickstart_1_install_dependencies.md).
Expand Down
7 changes: 3 additions & 4 deletions doc/dev/getting-started/quickstart_1_install_dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Sourcegraph has the following dependencies:
- [PostgreSQL](https://wiki.postgresql.org/wiki/Detailed_installation_guides) (v11 or higher)
- [Redis](http://redis.io/) (v5.0.7 or higher)
- [Yarn](https://yarnpkg.com) (v1.10.1 or higher)
- [NGINX](https://docs.nginx.com/nginx/admin-guide/installing-nginx/installing-nginx-open-source/) (v1.14 or higher)
- [SQLite](https://www.sqlite.org/index.html) tools
- [Golang Migrate](https://github.com/golang-migrate/migrate/) (v4.7.0 or higher)
- [Comby](https://github.com/comby-tools/comby/) (v0.11.3 or higher)
Expand All @@ -31,10 +30,10 @@ The following are two recommendations for installing these dependencies:
brew cask install docker
```

3. Install Go, Node Version Manager, PostgreSQL, Redis, Git, NGINX, golang-migrate, Comby, SQLite tools, and jq with the following command:
3. Install Go, Node Version Manager, PostgreSQL, Redis, Git, golang-migrate, Comby, SQLite tools, and jq with the following command:

```
brew install go yarn redis postgresql git gnu-sed nginx golang-migrate comby sqlite pcre FiloSottile/musl-cross/musl-cross jq watchman
brew install go yarn redis postgresql git gnu-sed golang-migrate comby sqlite pcre FiloSottile/musl-cross/musl-cross jq watchman
```

4. Install the Node Version Manager (`nvm`) using:
Expand Down Expand Up @@ -132,7 +131,7 @@ The following are two recommendations for installing these dependencies:
3. Install dependencies:

```
sudo apt install -y make git-all postgresql postgresql-contrib redis-server nginx libpcre3-dev libsqlite3-dev pkg-config golang-go musl-tools docker-ce docker-ce-cli containerd.io yarn jq
sudo apt install -y make git-all postgresql postgresql-contrib redis-server libpcre3-dev libsqlite3-dev pkg-config golang-go musl-tools docker-ce docker-ce-cli containerd.io yarn jq

# install golang-migrate (you must rename the extracted binary to `golang-migrate` and move the binary into your $PATH)
curl -L https://github.com/golang-migrate/migrate/releases/download/v4.7.0/migrate.linux-amd64.tar.gz | tar xvz
Expand Down