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
5,888 Commits 5 Branches 2 Tags
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
c815f017a0 Use build stage builder for backend 
After the backend uses multistage builds we also have to use `builder`
stage of the backend in Nitro-Web. Otherwise we won't be able to run the
seeds and login later on.
 2018-12-15 12:52:14 +01:00
Robert Schäfer
d3d1dcb72f
Add travis build status to README 2018-12-15 12:48:05 +01:00
Grzegorz Leoniec
059abd924c
Merge pull request #90 from Human-Connection/docker_push 
Add docker push script deployment
 2018-12-15 11:20:19 +01:00
Grzegorz Leoniec
aed2a73d13
Merge pull request #72 from Human-Connection/multistage-build 
Reduce image size with multistage builds
 2018-12-15 11:18:14 +01:00
Robert Schäfer
779190f711 Run yarn run dev in development 2018-12-14 23:41:11 +01:00
Robert Schäfer
94eea091de Ensure stage builder is used for testing 
But avoid synced volumes, otherwise the deployment will crash because
Travis cannot clean up files just before entering the deployment.
 2018-12-14 23:25:52 +01:00
Robert Schäfer
7e663a6c19 Add docker push script deployment 2018-12-14 23:23:09 +01:00
Robert Schäfer
4e816d9020 Fix (?) the build with an image tag for builder 
Also I added a base stage so we can have a common working directory.
 2018-12-14 23:10:48 +01:00
dependabot[bot]
6d0f69eb75
Bump apollo-link-http from 1.5.7 to 1.5.8 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.7 to 1.5.8.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-14 21:44:40 +00:00
Robert Schäfer
bef8aa1d6a Reduce docker image size with multistage build 
We don't need development dependencies in production. I also added the
BUILD_COMMIT environment variable to the image for convenience.
 2018-12-14 22:41:13 +01:00
Robert Schäfer
f9fec054d6
Merge pull request #70 from Human-Connection/production-build 
Build application for production without nodemon
 2018-12-14 22:39:03 +01:00
Robert Schäfer
9f78a96de2 Run babel node instead of nodemon 
Quote of @appinteractive:
```
Currently we are running nodemon on production which watches for filechanges and consumes much more memory then just node. As nodemon is only for development, I added a build step to compile the application for production and then only run the dist folder with pure node.
```
 2018-12-14 22:30:47 +01:00
Robert Schäfer
212725e44d Minor changes 2018-12-14 20:13:15 +01:00
Robert Schäfer
f2eca183cc Fix commit hash in deploy URL 
Executable deploy scripts
 2018-12-14 19:48:23 +01:00
Robert Schäfer
fca0a67bfd Don't user docker-compose.override.yml on Travis 
It creates volumes and these volumns will change ownership and linux
file permissions. That in turn will prevent Travis from removing those
files and eventually crash the deployment.
 2018-12-14 18:30:10 +01:00
Robert Schäfer
bdcadcb433 Update .dockerignore and .gitignore 2018-12-14 18:25:30 +01:00
Robert Schäfer
957bb4cea2
Add Travis build status to README 2018-12-14 18:24:12 +01:00
Robert Schäfer
3a15675e6c
Merge pull request #77 from Human-Connection/docker_push 
Use deployment script for docker images
 2018-12-14 18:18:30 +01:00
Robert Schäfer
2088d4e495 Use deployment script for docker images 
+Fix deprecation warning of docker login
 2018-12-14 18:16:34 +01:00
dependabot[bot]
ec9e6b24f9
Merge pull request #84 from Human-Connection/dependabot/submodules/Nitro-Web-010bac5 2018-12-14 04:45:05 +00:00
dependabot[bot]
2f9ad77e6d
Merge pull request #83 from Human-Connection/dependabot/submodules/Nitro-Backend-75bb73a 2018-12-14 04:44:38 +00:00
dependabot[bot]
2fd4e4b342
Bump Nitro-Web from 40e1ab3 to 010bac5 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `40e1ab3` to `010bac5`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](40e1ab3483...010bac50ab)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-14 04:43:11 +00:00
dependabot[bot]
1e15c3eacc
Bump Nitro-Backend from 766be0b to 75bb73a 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `766be0b` to `75bb73a`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](766be0bb80...75bb73a5f8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-14 04:43:10 +00:00
Grzegorz Leoniec
4fac6c4e5e
GitBook: [master] one page modified 2018-12-13 15:14:48 +00:00
Grzegorz Leoniec
e2379755d6
GitBook: [master] one page modified 2018-12-13 15:13:32 +00:00
Grzegorz Leoniec
75bb73a5f8
Merge pull request #59 from Human-Connection/ci-improvements 
CI Improvements
 2018-12-13 15:57:37 +01:00
Grzegorz Leoniec
e1bbf67c5b
Merge branch 'master' into ci-improvements 2018-12-13 15:49:47 +01:00
Robert Schäfer
010bac50ab
Merge pull request #79 from Human-Connection/admin-tags-and-categories 
Admin tags and categories
 2018-12-13 13:33:22 +01:00
Robert Schäfer
574073884b
Merge pull request #62 from Human-Connection/admin-tags-and-categories 
Admin tags and categories
 2018-12-13 13:18:14 +01:00
Robert Schäfer
2c463fdeaa
Merge branch 'master' into admin-tags-and-categories 2018-12-13 13:16:51 +01:00
Robert Schäfer
4513b40fb3 Fix the clone of backend repo 
See: https://stackoverflow.com/a/20115678
 2018-12-13 12:42:23 +01:00
Robert Schäfer
00552c15af Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-13 10:59:05 +01:00
Grzegorz Leoniec
2adb22d363
Merge pull request #89 from Human-Connection/dependabot/npm_and_yarn/vue-jest-3.0.2 
Bump vue-jest from 3.0.1 to 3.0.2
 2018-12-13 08:24:44 +01:00
dependabot[bot]
4b9797e713
Merge pull request #82 from Human-Connection/dependabot/submodules/Nitro-Backend-766be0b 2018-12-13 04:41:47 +00:00
dependabot[bot]
0f26382ebe
Merge pull request #81 from Human-Connection/dependabot/submodules/Nitro-Web-40e1ab3 2018-12-13 04:40:59 +00:00
dependabot[bot]
b4e1e1f44e
Bump Nitro-Backend from 99a9d51 to 766be0b 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `99a9d51` to `766be0b`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](99a9d51596...766be0bb80)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-13 04:40:37 +00:00
dependabot[bot]
3de6b6623f
Bump Nitro-Web from 64abd76 to 40e1ab3 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `64abd76` to `40e1ab3`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](64abd767e2...40e1ab3483)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-13 04:40:36 +00:00
dependabot[bot]
69ef2d65fc
Bump vue-jest from 3.0.1 to 3.0.2 
Bumps [vue-jest](https://github.com/eddyerburgh/vue-jest) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/eddyerburgh/vue-jest/releases)
- [Commits](https://github.com/eddyerburgh/vue-jest/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-13 04:26:14 +00:00
Robert Schäfer
a40fafa455 Cucumber preprocessor must be added locally 2018-12-12 22:14:56 +01:00
Robert Schäfer
fd7a4d89b6 Add cucumber-preprocessor to Travis build 2018-12-12 22:01:48 +01:00
Robert Schäfer
908e9b47f6 Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-12 21:44:43 +01:00
Robert Schäfer
669ef1076f Drop the component test for the page 
@appinteractive and I decided to test the page with a fullstack test. It
makes more sense for pages who request data from the backend.
 2018-12-12 21:39:36 +01:00
Robert Schäfer
c8f23f9e6e All cucumbers have passed 2018-12-12 21:35:37 +01:00
Robert Schäfer
96a30ca03e Implement first scenario for categories 2018-12-12 18:58:35 +01:00
Robert Schäfer
6fc203003a Undo the local imports 2018-12-12 18:01:04 +01:00
Robert Schäfer
766be0bb80
Merge pull request #66 from Human-Connection/run_full_stack_tests 
Docker ignore scripts folder, bash compatibility
 2018-12-12 16:34:46 +01:00
Robert Schäfer
a0c831fb81
Merge branch 'master' into run_full_stack_tests 2018-12-12 16:33:56 +01:00
Robert Schäfer
66f7265b15 Remove the script to trigger full stack tests 
This will be handled by the frontend repo
 2018-12-12 16:32:50 +01:00
Grzegorz Leoniec
794d8361d5
merged master in 2018-12-12 16:30:08 +01:00
Grzegorz Leoniec
755e54f303
Merge pull request #63 from Human-Connection/dependabot/npm_and_yarn/eslint-5.10.0 
Bump eslint from 5.9.0 to 5.10.0
 2018-12-12 16:16:13 +01:00