Skip to content
This repository has been archived by the owner on Feb 23, 2023. It is now read-only.

Commit

Permalink
Don't proxy to stellar.org (#209)
Browse files Browse the repository at this point in the history
* Don't proxy to stellar.org

* Update node 10 -> 14

* Update sharp and puppeteer

* Fix puppeteer

* Fix unexpected eslint error

Appears to be because of a recent gatsby update. gatsbyjs/gatsby#25720
  • Loading branch information
vcarl authored Aug 4, 2020
1 parent b58a964 commit e1d71e3
Show file tree
Hide file tree
Showing 5 changed files with 3,453 additions and 5,842 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
extends: ["@stellar/eslint-config"],
ignorePatterns: ["**/_this_is_virtual_fs_path_/**/*"],
rules: {
"import/no-unresolved": 0
}
"import/no-unresolved": 0,
},
};
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER Carl Vitullo <[email protected]>

RUN apt-get update && apt-get install -y curl wget git apt-transport-https && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x xenial main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb https://deb.nodesource.com/node_14.x xenial main" | tee /etc/apt/sources.list.d/nodesource.list && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
apt-get update && apt-get install -y nodejs yarn
Expand All @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y curl wget git apt-transport-https && \
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
apt-get update && \
apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
--no-install-recommends && \
rm -rf /var/lib/apt/lists/*

Expand Down
7 changes: 5 additions & 2 deletions nginx/includes/server.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ root /usr/share/nginx/html/new-docs/;

# FYI: Redirect breaks
location = / {
proxy_pass https://proxy.stellar.org/developers;
proxy_ssl_server_name on;
# `$scheme://$http_host` is because otherwise, it adds the port nginx is
# listening on. Since we listen on 80 but expose 8000 by default from docker
# locally, the redirect was going to `localhost/docs` which doesn't have a
# server listening.
return 302 $scheme://$http_host/docs;
}

location / {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"pretty-quick": "^1.10.0",
"prismjs": "^1.17.1",
"prop-types": "^15.7.2",
"puppeteer": "^3.0.4",
"puppeteer": "^5.2.1",
"qs": "6.9.1",
"react": "^16.12.0",
"react-collapse": "^5.0.1",
Expand All @@ -91,7 +91,7 @@
"react-helmet": "^5.2.1",
"react-test-renderer": "^16.12.0",
"react-transition-group": "^4.3.0",
"sharp": "^0.23.4",
"sharp": "^0.25.4",
"stellar-sdk": "^3.3.0",
"styled-components": "^4.4.1",
"styled-normalize": "^8.0.6",
Expand Down
Loading

0 comments on commit e1d71e3

Please sign in to comment.