27 Commits

Author SHA1 Message Date
sparklyballs
e7adab45ff
Merge pull request #5 from linuxserver/cosmetic_stuff
cosmetic changes using variables for all packages
16
2018-04-04 09:58:14 +01:00
sparklyballs
791d38dc3b cosmetic changes using variables for all packages 2018-04-04 09:48:15 +01:00
Paul Hendryx
17bc60c5bc
Merge pull request #4 from linuxserver/jsonscript
added org to influxdb, added org and full url to repo on json feed
15
2018-04-03 23:34:22 -04:00
Paul Hendryx
a3b123b4c2 added org to influxdb, added org and full url to repo on json feed 2018-04-03 23:29:12 -04:00
Paul Hendryx
47d777f510
Merge pull request #2 from linuxserver/linting
linting fix
14
2018-03-27 20:27:47 -04:00
Paul Hendryx
c0f35c6a8e
Merge pull request #3 from linuxserver/jsonscript
oopsy on hash key names overwriting each other
2018-03-27 20:27:21 -04:00
Paul Hendryx
1afc9a8e1f oopsy on hash key names overwriting each other 2018-03-27 20:18:19 -04:00
sparklyballs
b7a9a23cbb change to new baseimage name and tidy Dockerfile 2018-03-26 10:30:41 +01:00
sparklyballs
9d57d2ce36 linting fix 2018-03-26 10:18:33 +01:00
Paul Hendryx
86d7f4f197
Merge pull request #1 from linuxserver/jsonscript
Jsonscript
12
2018-03-25 12:23:59 -04:00
Paul Hendryx
2859c8e414 Merge branch 'master' into jsonscript
# Conflicts:
#	Dockerfile
2018-03-25 12:13:44 -04:00
Paul Hendryx
b807b6876e add sinatra, json pull, etc 2018-03-25 12:10:32 -04:00
Paul Hendryx
f45bcb41b1 change name from stats.rb to stats_pull.rb 2018-03-25 11:24:25 -04:00
Paul Hendryx
e7c8b7491e update stats pull 2018-03-25 11:23:41 -04:00
sparklyballs
010aba2ac0 simplify Dockerfile 10 11 2017-04-06 12:18:49 +01:00
sparklyballs
b867b3ad81 influxdb kill by pid and tidying Dockerfile 9 2017-04-06 10:16:05 +01:00
sparklyballs
faea8e8b0f kill grafana by pid 8 2017-04-06 09:35:06 +01:00
sparklyballs
d4989967c9 some Dockerfile tidying and using variables for package versions 7 2017-04-06 09:19:14 +01:00
Paul Hendryx
d9144067c1 upgrade influxdb and grafana 6 2017-02-16 08:32:38 -05:00
Paul Hendryx
06cf0736ce chown 744 cron file 5 2016-11-24 00:40:14 -05:00
Paul Hendryx
3d3531ffef foreground cron and create /config/app dir 4 2016-11-23 21:52:58 -05:00
Paul Hendryx
1acd561dd7 netcat 3 2016-11-23 21:18:57 -05:00
Paul Hendryx
30000a4dcd add cron 2 2016-11-23 20:57:03 -05:00
Paul Hendryx
a2f005bacc Merge branch 'master' into master-merge
# Conflicts:
#	.gitignore
#	Dockerfile
1
2016-11-20 15:36:30 -05:00
Paul Hendryx
c7f2978a95 added .gitignore 2016-11-20 15:29:28 -05:00
Paul Hendryx
08e095e820 initial commit 2016-11-20 15:29:08 -05:00
sparklyballs
1d8924f129 first commit 2016-11-20 05:50:28 +00:00