Compare commits

...

5 Commits

Author SHA1 Message Date
dependabot[bot]
bbd48d0f6b Bump react-chartjs-2 from 2.11.1 to 2.11.2
Bumps [react-chartjs-2](https://github.com/reactchartjs/react-chartjs-2) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/reactchartjs/react-chartjs-2/releases)
- [Commits](https://github.com/reactchartjs/react-chartjs-2/commits)

---
updated-dependencies:
- dependency-name: react-chartjs-2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-10 18:29:55 +00:00
Henry Whitaker
58e82dc9a8 Actually pass days to the action 2021-09-10 18:58:02 +01:00
Henry Whitaker
0dff534dfd Also do the arm dockerfile 2021-09-10 18:54:46 +01:00
Henry Whitaker
fba69514b2 undo dumb thing 2021-09-10 18:50:40 +01:00
Henry Whitaker
1fcaa795cd Chmod +x the artsan file 2021-09-10 18:48:36 +01:00
5 changed files with 19 additions and 12 deletions

View File

@@ -27,7 +27,7 @@ class HomepageDataController extends Controller
return [
'latest' => run(GetLatestSpeedtestData::class),
'time' => run(GetSpeedtestTimeData::class),
'time' => run(GetSpeedtestTimeData::class, $days),
'fail' => run(GetFailedSpeedtestData::class),
'config' => SettingsHelper::getConfig(),
];

View File

@@ -3,7 +3,8 @@ LABEL maintainer=henrywhitaker3@outlook.com
ENV arch='arm'
COPY conf/ /
COPY docker/conf/ /
COPY . /site
EXPOSE 80 443

View File

@@ -26,10 +26,11 @@ else
tar zxvf speedtest.tgz > /dev/null
cp speedtest /site/app/Bin/
HOME=/config && s6-setuidgid abc /site/artisan speedtest:eula > /dev/null
chmod +x /site/artisan
HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
HOME=/root
else
HOME=/config && s6-setuidgid abc /config/www/artisan speedtest:eula > /dev/null
HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
HOME=/root
fi
fi

19
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"js-cookie": "^2.2.1",
"react-beautiful-dnd": "^13.1.0",
"react-bootstrap": "^1.5.1",
"react-chartjs-2": "^2.11.1",
"react-chartjs-2": "^2.11.2",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-toastify": "^7.0.3"
@@ -9663,12 +9663,17 @@
}
},
"node_modules/react-chartjs-2": {
"version": "2.11.1",
"resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.1.tgz",
"integrity": "sha512-G7cNq/n2Bkh/v4vcI+GKx7Q1xwZexKYhOSj2HmrFXlvNeaURWXun6KlOUpEQwi1cv9Tgs4H3kGywDWMrX2kxfA==",
"version": "2.11.2",
"resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz",
"integrity": "sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.7.2"
},
"peerDependencies": {
"chart.js": "^2.3",
"react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
"react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
}
},
"node_modules/react-dom": {
@@ -21485,9 +21490,9 @@
}
},
"react-chartjs-2": {
"version": "2.11.1",
"resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.1.tgz",
"integrity": "sha512-G7cNq/n2Bkh/v4vcI+GKx7Q1xwZexKYhOSj2HmrFXlvNeaURWXun6KlOUpEQwi1cv9Tgs4H3kGywDWMrX2kxfA==",
"version": "2.11.2",
"resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz",
"integrity": "sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw==",
"requires": {
"lodash": "^4.17.19",
"prop-types": "^15.7.2"

View File

@@ -31,7 +31,7 @@
"js-cookie": "^2.2.1",
"react-beautiful-dnd": "^13.1.0",
"react-bootstrap": "^1.5.1",
"react-chartjs-2": "^2.11.1",
"react-chartjs-2": "^2.11.2",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-toastify": "^7.0.3"