56 Commits

Author SHA1 Message Date
dependabot[bot]
22d7116e4b
Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /backend
Bumps node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-16 22:53:48 +00:00
f4f016265a
capsulate in /bin/sh 2023-06-02 12:18:08 +02:00
a50e3f2f14
Merge branch 'master' into typescript 2023-05-31 10:21:04 +02:00
dependabot[bot]
8f9ebd77b2
Bump node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17 in /backend
Bumps node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 14:24:08 +00:00
8ca55f4d6e
enable typescript 2023-05-23 01:49:55 +02:00
dependabot[bot]
4597f9b923
Bump node from 19.8.1-alpine3.17 to 19.9.0-alpine3.17 in /backend
Bumps node from 19.8.1-alpine3.17 to 19.9.0-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-17 13:11:23 +00:00
dependabot[bot]
180c363f9c
Bump node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17 in /backend
Bumps node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-05 17:04:02 +00:00
Wolfgang Huß
14426b4397 Add node gyp dependencies 2023-02-23 13:23:23 +01:00
6cc7b4aa18
node19 docker 2023-01-25 16:12:15 +01:00
Wolfgang Huß
5f9155805d Fix 'Dockerfile' for webapp and backend for running locally and in cluster 2022-07-17 20:32:03 +02:00
Wolfgang Huß
9894abb29a Revert remove of '${DOCKER_WORKDIR}' 2021-06-07 19:03:55 +02:00
Wolfgang Huß
3f7d1c7bd0 Follow suggestions of Moriz and Robert 2021-06-07 18:50:21 +02:00
b3538577dc
backend production=false 2021-06-07 15:31:29 +02:00
791d873df2
-remove node_modules
-build production
2021-06-07 14:04:36 +02:00
Wolfgang Huß
931705976d Establish new deployment structure with base and code Docker images, first step 2021-05-30 17:58:04 +02:00
79beb840c5
-separate commands in two, docker build & save to allow multi-line commands
-have arg and env variables
2021-04-17 13:15:45 +02:00
d354f9630a
Use build args instead of envs for the version, date & commit 2021-04-17 12:44:01 +02:00
6110557abf
fixed versions to follow SemVer 2.0 style (https://semver.org/spec/v2.0.0.html) 2021-02-25 20:48:20 +01:00
5503216ad4
- first steps towards docker image deployment & github autotagging 2021-02-08 15:43:09 +01:00
8a0b3a2826
- build test images 2021-01-30 19:25:39 +01:00
52842c51bb
- working production docker-compose setup 2021-01-23 03:10:07 +01:00
c41d32d527
- fixed node_modules running out of sync since they are on a volume for development docker builds 2021-01-20 13:43:22 +01:00
c9a5df0cd6
- fixed build version in webapp and backend 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
a4e4d5d74e
New Dockerfile for the backend 2021-01-19 23:18:52 +01:00
Wolfgang Huß
c286b556f2 Downgrade Node version to v12.19.0-alpine3.10
- Testing if this solves the failing build.
2020-12-02 18:34:06 +01:00
Wolfgang Huß
d2d257bc1c Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into white-labeling
# Conflicts:
#	backend/Dockerfile
#	webapp/Dockerfile
#	webapp/Dockerfile.maintenance
#	webapp/components/LoginForm/LoginForm.vue
#	webapp/package.json
2020-12-02 11:11:26 +01:00
dependabot-preview[bot]
ff1e228fcc
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /backend
Bumps node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-25 04:59:48 +00:00
Moriz Wahl
e47671c52a further changed requested by Tirokk 2020-11-24 19:10:46 +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
Wolfgang Huß
844da649f0 Fix node version to 'node:12.19.0-alpine3.10'
- Changed from 'node:lts-alpine' to 'node:12.19.0-alpine3.10'.
2020-11-03 13:02:24 +01:00
Wolfgang Huß
13c70903e1 Change docker repository to develop-backend
- nitro-backend  —>  develop-backend
2020-10-28 10:59:36 +01:00
roschaefer
a741721295 Remove labels from Dockerfiles
Version was out of date anyways
2020-06-05 11:19:57 +02:00
roschaefer
23ae569509 Rename dockerhub organizations
..plus get rid of obsolete prefix `nitro-`.
2020-06-04 13:04:05 +02:00
mattwr18
dae1062ad0 Use node LTS in production 2020-01-09 13:33:05 +01:00
dependabot-preview[bot]
319de54265
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /backend
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-15 07:06:25 +00:00
mattwr18
dab05d9e67 Fix embeds settings page
- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-10-11 14:01:39 +02:00
dependabot-preview[bot]
37bf09dc6e
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-09 08:33:36 +00:00
dependabot-preview[bot]
73e278f897
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend
Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 07:27:10 +00: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
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
dependabot-preview[bot]
8d4874effb
Bump node from 12.9-alpine to 12.10.0-alpine in /backend
Bumps node from 12.9-alpine to 12.10.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-06 04:25:14 +00:00
dependabot-preview[bot]
645fd62bb7
Bump node from 12.8-alpine to 12.9-alpine in /backend
Bumps node from 12.8-alpine to 12.9-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-22 04:26:29 +00:00
dependabot-preview[bot]
f9bb12f0af
Bump node from 12.7-alpine to 12.8-alpine in /backend
Bumps node from 12.7-alpine to 12.8-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 04:31:08 +00:00
dependabot-preview[bot]
b0bde9f73e
Bump node from 12.6-alpine to 12.7-alpine in /backend
Bumps node from 12.6-alpine to 12.7-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-26 04:22:08 +00:00
dependabot-preview[bot]
27cc6c49af
Bump node from 12.5-alpine to 12.6-alpine in /backend
Bumps node from 12.5-alpine to 12.6-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-05 04:24:30 +00:00