IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
141 Commits 5 Branches 2 Tags
Commit Graph

141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
5eae8a8978 Configure Travis CI conditional builds 
and add placeholder deployment. This commit should deploy to

* `production` if on branch master AND tagged
* `staging` if on branch master
* `custom` if tagged

The custom deployment is inspired by https://zeit.co/now and should
deploy features for demonstration purposes before merging into master.

It will happen that we trigger multiple deployments with this workflow:
If we deploy to production, that is going to deploy to a custom
environment and to staging. But I think this is not too problematic.

What do you think @appinteractive @mcwimpy?
 2018-12-04 00:24:26 +01:00
Robert Schäfer
fa8cbba421 Copy .env.template for dummy secrets on Travis 2018-12-03 20:49:23 +01:00
Robert Schäfer
d201d73670 Run seeds without docker-compose 
I give up with running docker-compose on Travis CI. Using `bash` instead
of Linux alpine's `sh` does **not** fix the issue as suggested here:
https://github.com/kimmobrunfeldt/concurrently/issues/104
 2018-12-03 20:43:42 +01:00
Robert Schäfer
f1c3c6bede Wording: no-auth-server instead of backdoor 
Suggested by @appinteractive
 2018-12-03 20:43:16 +01:00
Robert Schäfer
d061348ec8 Use npm: prefixes to DRY package.json 
@appinteractive and @Mastercuber have a look, I guess this feature of
concurrently is new to you: https://www.npmjs.com/package/concurrently#usage

For some reason, concurrently hangs when run with docker-compose. I
haven't figured out how to fix this. Run locally, everything terminates
as expected.
 2018-12-03 19:28:42 +01:00
Robert Schäfer
298db35546 Use simple past and consistend naming 2018-12-03 19:04:45 +01:00
Robert Schäfer
a7b4b55b6c Follow up to @appinteractive's commit e2f7bc51 
Next time: `git grep "backend"` 👍
 2018-12-03 18:57:53 +01:00
Robert Schäfer
333f181161 Fix typo in .travis.yml 2018-12-03 18:31:46 +01:00
Robert Schäfer
2ace3e5ce8 Disable eslint for the always-true if-condition 
See: https://github.com/Human-Connection/Nitro-Backend/issues/41
 2018-12-03 18:28:34 +01:00
Robert Schäfer
f00dbb67df Re-add success notification on Discord 
Why was it disabled in the first place @appinteractive?
 2018-12-03 18:06:08 +01:00
Robert Schäfer
15d9178369 Install and configure eslint 
Fix all violations but one - there is a mock in our authentication.
 2018-12-03 18:05:28 +01:00
Robert Schäfer
0bfe880c21 Use docker-compose for testing on Travis CI 
Currently running
* seeds
* eslint
 2018-12-03 17:28:53 +01:00
Robert Schäfer
61d252177a
Merge pull request #15 from Mastercuber/unseed-db 
Add unseeder
 2018-12-03 17:20:32 +01:00
Robert Schäfer
66b12f28b8
Wording: unseed does not exist but clean 2018-12-03 17:16:41 +01:00
Armin Kunkel
b5ce0351c7 Add yarn db:reset script 2018-12-03 15:38:08 +01:00
Grzegorz Leoniec
f78178c545
Merge pull request #38 from Human-Connection/upgrade-packages 
uppgraded packages
 2018-11-30 11:40:18 +01:00
Grzegorz Leoniec
7780c4b846 uppgraded packages 2018-11-30 11:37:19 +01:00
Grzegorz Leoniec
3760ffad59
Merge pull request #22 from Human-Connection/travis-ci-build 
Travis ci build
 2018-11-30 09:54:31 +01:00
Grzegorz Leoniec
38c6323d1f fixed vendor name 2018-11-30 09:38:20 +01:00
Grzegorz Leoniec
27a9410089 use humanconnection/nitro-backend 2018-11-30 09:36:03 +01:00
Grzegorz Leoniec
2fb239de7c fixed docker-compose to use humanconnection/nitro-backend:latest 2018-11-30 09:34:31 +01:00
Grzegorz Leoniec
86662eb56c do not abort on test command 2018-11-30 09:13:13 +01:00
Grzegorz Leoniec
834aae1ed2 removed seeding on build for now 2018-11-29 19:45:35 +01:00
Grzegorz Leoniec
c187e71d6a
Merge branch 'master' into travis-ci-build 2018-11-29 19:37:06 +01:00
Grzegorz Leoniec
28ed218d99 updated nodemon due to possible security issue: https://github.com/dominictarr/event-stream/issues/116 2018-11-27 11:27:19 +01:00
Grzegorz Leoniec
1b8cdca266
Merge pull request #23 from Human-Connection/updated-docker-repository 
updated kubernetes documentation - use humanconnection/nitro-backend
 2018-11-27 10:38:36 +01:00
Grzegorz Leoniec
8e2f4eb6fb
Merge pull request #24 from Human-Connection/fix-badges-seeder-and-url-fix 
Fixed Badges Seeder and URL Fix Middleware
 2018-11-27 10:38:02 +01:00
Grzegorz Leoniec
2f6f7cc1b7
Merge pull request #25 from Human-Connection/updated-seed-documentation 
Update Seed Command in README.md
 2018-11-27 10:37:34 +01:00
Grzegorz Leoniec
ebcec50a09
Update README.md 2018-11-26 18:03:59 +01:00
Grzegorz Leoniec
5597e34dab Fixed Badges Seeder and URL Fix Middleware 2018-11-26 17:18:09 +01:00
Grzegorz Leoniec
e218773dd5 fixed build by using install instead before_script 2018-11-25 14:23:52 +01:00
Grzegorz Leoniec
e2f7bc516c improved docker file 2018-11-24 12:58:13 +01:00
Grzegorz Leoniec
b25a7d673e
user humanconnection/nitro-backend 2018-11-24 12:41:17 +01:00
Grzegorz Leoniec
80e036c0fb updated travis build 2018-11-24 12:38:51 +01:00
Grzegorz Leoniec
89d30c01a0 unified travis.yml and prefixed docker image 2018-11-24 12:10:50 +01:00
Robert Schäfer
f0d5641990 Merge remote-tracking branch 'origin/master' into travis-ci-build 2018-11-23 20:55:50 +01:00
Robert Schäfer
c50b881089
Merge pull request #18 from Human-Connection/fix-seeder 
Seed the database with authentication
 2018-11-23 20:51:12 +01:00
Robert Schäfer
8bb90e52a6 Copy .env.template in Dockerfile to seed on travis 2018-11-23 20:49:09 +01:00
Robert Schäfer
d74aa6dd02 Build and run docker container on Travis 
The docker container environment should be the single source of truth
 2018-11-23 20:45:17 +01:00
Robert Schäfer
68b143be7e
Update src/middleware/index.js 
Co-Authored-By: appinteractive <greg@app-interactive.de>
 2018-11-23 16:51:29 +01:00
Grzegorz Leoniec
2f67cfc741 fixed tag 2018-11-23 16:09:59 +01:00
Grzegorz Leoniec
e5b89dc1c6 Added travis configuration 2018-11-23 16:08:02 +01:00
Grzegorz Leoniec
3912515c25 do not allow disabling permissions in production 2018-11-22 12:22:22 +01:00
Grzegorz Leoniec
c1387f262d added permissions as first item. 2018-11-22 11:36:49 +01:00
Grzegorz Leoniec
8c72c88e59 made permissions accessible for the outside 2018-11-21 15:38:47 +01:00
Grzegorz Leoniec
d5a0f03cc4 fixed merge issues 2018-11-21 15:38:33 +01:00
Grzegorz Leoniec
fa2c3fc24b shortened GRAPHQL_LISTEN_PORT to GRAPHQL_PORT 2018-11-21 15:30:26 +01:00
Grzegorz Leoniec
46c0289881 merge conflict fixed 2018-11-21 15:29:18 +01:00
Grzegorz Leoniec
c6420b5351 simplyfied schema and modulized seeding process 2018-11-21 15:16:55 +01:00
Grzegorz Leoniec
0ee32d8b01
Merge pull request #20 from Human-Connection/babel 
Update Babel & babel-node
 2018-11-21 11:28:57 +01:00