53 Commits

Author SHA1 Message Date
Wolfgang Huß
f5c4cd7701 Replace in docker compose 'ocelotsocialnetwork/*:latest' by 'ocelotsocialnetwork/*:local-production' 2022-07-15 09:29:59 +02:00
Wolfgang Huß
0fef1bbd60 Change Docker compose 'maintenance' port from '5000' to '3001'
- Because port '5000' has a standard use on macOS, it is said.
2022-07-13 10:49:21 +02:00
Wolfgang Huß
04cd391a39 Remove image entries in 'docker-compose.yml' and 'docker-compose.override.yml' 2022-07-13 10:02:18 +02:00
Wolfgang Huß
a0a2fb43ab Prettify some formating 2021-05-30 20:52:16 +02:00
5503216ad4
- first steps towards docker image deployment & github autotagging 2021-02-08 15:43:09 +01:00
c3147bbd4a
Update docker-compose.yml
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2021-01-22 14:19:23 +01:00
cbf799d265
- build community edition of neo4j 2021-01-19 23:18:52 +01:00
b25af045db
- include maintenance in production environment 2021-01-19 23:18:52 +01:00
7cc003602f
- docker-compose definition order 2021-01-19 23:18:52 +01:00
2518e38582
- webapp Dockerfile
- cleanup backend Dockerfile
- docker-compose cleanup
- docker-compose networks
- docker-compose for production, docker-compose.override for development
- security
- todos
2021-01-19 23:18:52 +01:00
269e38b56e
backend dockerfile and compose seem to be pretty solid now 2021-01-19 23:18:52 +01:00
0523c88bb8
- fixed docker compose for backend
- changed backend port to 4000
- removed volume from development build stage
2021-01-19 23:18:52 +01:00
Wolfgang Huß
2495f4fa72 Fixed live reload of Nuxt for docker-compose
- If code was changed by the developer in backend and webapp live reload was not executed.
2021-01-18 15:53:08 +01:00
Wolfgang Huß
35e9404e8c Correct docker-compose.yml 2021-01-07 15:33:26 +01:00
Moriz Wahl
af54ec3704 further changes requested by Tirokk 2020-12-01 10:46:41 +01:00
Mogge
75658a2f32
Merge branch 'master' into white-labeling 2020-11-23 13:35:40 +01:00
Moriz Wahl
78f9e20356 define volumes 2020-11-16 09:56:13 +01:00
Moriz Wahl
ecb0bb3766 Starting rebranding to ocelot.social 2020-11-10 12:08:44 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
Moriz Wahl
5fc24a3751 merged conflicts 2020-11-10 09:38:45 +01:00
ogerly
f498ba8c65 fix: new mapbox token 2020-11-05 15:38:13 +01:00
Wolfgang Huß
a1e4a5bf5f Change docker repository to develop-neo4j
- neo4j  —>  develop-neo4j
2020-10-29 10:39:09 +01:00
Wolfgang Huß
13c70903e1 Change docker repository to develop-backend
- nitro-backend  —>  develop-backend
2020-10-28 10:59:36 +01:00
Wolfgang Huß
b6c8acab36 Change docker repository to develop-webapp
- nitro-web  —>  develop-webapp
2020-10-28 10:52:07 +01:00
Wolfgang Huß
360f545fb7 Change docker account
- humanconnection  —>  ocelotsocialnetwork
2020-10-28 10:36:14 +01:00
roschaefer
dd09dfa721 Replace welcome image in email templates 2020-06-15 14:54:03 +02:00
roschaefer
16c7be1cc4 Parameterize emails in backend 2020-06-05 16:49:32 +02:00
roschaefer
2c4c9ab8b0 feat: Avoid new builds on base docker-compose.yml 2020-06-04 17:11:04 +02:00
roschaefer
23ae569509 Rename dockerhub organizations
..plus get rid of obsolete prefix `nitro-`.
2020-06-04 13:04:05 +02:00
roschaefer
84d3323856 refactor: remove redundant port configuration
If you set GRAPQHL_URI the port is already in there
2019-11-15 11:45:52 +01:00
mattwr18
b1573cc25a Update neo4j to Enterprise edition
- accept license agreement
2019-10-03 16:11:29 +02:00
Robert Schäfer
f3ecb5c4fc
Merge pull request #1688 from Human-Connection/configure-docker-to-work-with-storybook
Configure docker to work with storybook
2019-09-28 15:30:57 +02:00
Vasily Belolapotkov
8c01f1d332 update neo4j docker config 2019-09-28 12:14:04 +03:00
Alina Beck
839f671c14
Apply suggestions from code review 2019-09-25 16:51:35 +01:00
mattwr18
2a02a3dc07 Configure docker to work with storybook 2019-09-24 11:25:16 +02:00
roschaefer
7f2cd575cb Push all docker images at VERSION to dockerhub
Inspired by the tagging of e.g. `node` on dockerhub:
https://hub.docker.com/_/node/?tab=description

I would like to push the current version of all our images to dockerhub.
This is a first step to push to production later on.

If sb. increments the VERSION file, this is considered a release.
2019-09-12 23:41:58 +02:00
roschaefer
08244ab4b2 Address @mattwr18's review here:
https://github.com/Human-Connection/Human-Connection/pull/1543#pullrequestreview-287593264

Thinking about it, I really ask myself why I did not find this solution
earlier 🙈

Of course, you don't want to share the generated `buildDir`
with the host system. If you happen to share the `webapp/` folder,
simply point NuxtJS to a build directory somewhere else. Easy!
2019-09-12 22:56:52 +02:00
roschaefer
bc153ee42e Synchronize dockerfiles, fix cypress
.. make tippy.js a production dependency (was throwing errors on my
machine).
2019-09-12 12:16:20 +02:00
roschaefer
10418f061b Various changes to build pipeline
* Use `production` docker images for cypress tests. As one of our contributors
pointed out: It is bad practice to end-to-end test sth. else than the actual
production images.
* Have a dedicated `docker-compose.travis-integration.yml` to test
backend integration tests. The backend *needs* a database when doing
integration tests. So there is no way around using docker-compose. But
we could stop using the `build-and-test` stage when we do cypress tests.
* Remove a couple of unused ports and DRY `docker-compose.override.yml`
* Build and tag all images first and then run `docker-compose .. up` - I
hope this will not rebuild the image.
* Reduce docker image size
2019-09-12 00:29:36 +02:00
roschaefer
5804b1352c Remove old docker files 2019-09-11 08:43:26 +02:00
roschaefer
5cf82d5e18 Fix build
Here are the issues
* webapp was built with `NODE_ENV=production` but started with
`NODE_ENV=development`
* using the provided `docker-compose.travis.yml` the command `yarn run
start` would look in the wrong folder
* removed duplicate environment definition
2019-09-11 02:22:08 +02:00
Robert Schäfer
ff7143dcb1 Remove obsolete "MOCKS"
It's unused code after all and I think we can improve the code base by
removing confusing code.
2019-08-08 20:18:32 +02:00
Matt Rider
733d3333c9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 906-maintenace-mode 2019-07-29 08:52:10 +02:00
Robert Schäfer
17ccbcefa6 Remove embed service from docker-compose.yml 2019-07-19 22:03:49 +02:00
Robert Schäfer
b74590821c Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-16 21:33:46 +02:00
Robert Schäfer
fa024ac47a Sledgehammer the file permission problem on docker
NuxtJS wants to write into .nuxt. If the docker container writes into
.nuxt it will have the file permissions of the docker container user
even on the host system. So on the host system you cannot remove the
folder .nuxt anymore. This gets in the way of running NuxtJS on the host
system.
2019-07-15 13:14:40 +02:00
Matt Rider
438bb36e90 Add nginx maintenance and test locally 2019-07-03 14:27:30 -03:00
Matt Rider
ed658e9d32 Dockerize embed, kubernetes config, add back deployment .env 2019-07-03 11:12:43 -03:00
Matt Rider
eabb58e851 Merge in Nitro-Embed 2019-07-03 08:51:39 -03:00
f78c54a3e8
refactored backend structure 2019-05-31 19:31:39 +02:00