Commit Graph

23 Commits

Author SHA1 Message Date
7d298a0c68 Updated docker-compose.yml and package.json 2019-05-07 01:38:19 +00:00
4852e338d5 Merge branch 'dev' into 'master'
See merge request MrFlutters/Fluttershub!6
2019-05-07 01:16:15 +00:00
81cb138750 Update fluttershub website and implement new deployment 2019-05-07 01:16:14 +00:00
c3e0a2bf78 updated docker-compose.yml to launch master and dev branches at the same time 2019-05-07 01:20:07 +01:00
3502aeedde added LICENSE to .dockerignore 2019-05-07 01:19:25 +01:00
18d45f5d45 Removed old/unused parts 2019-05-07 00:52:36 +01:00
ca4bcd2577 Add Licence for new version of website 2019-05-07 00:51:55 +01:00
7663c49982 Testing to see if this actually affects build time 2019-05-07 00:31:28 +01:00
0e65c89741 Removed extra $'s left in by mistake 2019-05-07 00:29:24 +01:00
dc8cb57311 Changed traefik.backend to be unique per build 2019-05-07 00:27:11 +01:00
d716a493a0 Build dev and master differently 2019-05-07 00:08:17 +01:00
1135fd5682 Moving label to attempt to fix strange bug with CICD 2019-05-06 23:52:49 +01:00
969af01d4c Updated docker image for new deployment 2019-05-06 23:42:50 +01:00
85784e521c Updated sas package and package-lock.json 2019-05-06 23:42:40 +01:00
5df7f1e2a0 Changed domain to be fully lowercase 2019-05-06 23:42:10 +01:00
6ef02042e4 test 2019-05-03 17:30:28 +01:00
3e4b442f17 Fixed hardcoded domain left in 2019-05-03 17:15:27 +01:00
12f84245f8 Updated Configuration 2019-05-03 17:04:28 +01:00
d552720642 Added .dockerignore and removed unneededd build.txt 2019-05-03 16:41:42 +01:00
1e11f4f000 Use npm ci instead of npm install 2019-05-03 16:37:31 +01:00
2bfe860d73 Cleaned up gitlab-ci and Dockerfile 2019-05-03 16:34:03 +01:00
7f048ae31f Add .gitlab-ci.yml 2019-05-03 15:22:47 +00:00
6ce9ccdd57 add README 2019-05-03 16:21:50 +01:00