26 Commits

Author SHA1 Message Date
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
Moriz Wahl
af54ec3704 further changes requested by Tirokk 2020-12-01 10:46:41 +01:00
dependabot-preview[bot]
b6fe5483cc
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /webapp
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:57:43 +00:00
Moriz Wahl
e47671c52a further changed requested by Tirokk 2020-11-24 19:10:46 +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ß
b6c8acab36 Change docker repository to develop-webapp
- nitro-web  —>  develop-webapp
2020-10-28 10:52:07 +01:00
roschaefer
37b3014ac7 Parameterize manifest 2020-06-05 17:37:16 +02: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]
1a15dd4db5
build(deps): bump node from 13.5.0-alpine to 13.6.0-alpine in /webapp
Bumps node from 13.5.0-alpine to 13.6.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-09 04:19:10 +00:00
dependabot-preview[bot]
9d1751f779
build(deps): bump node from 13.4.0-alpine to 13.5.0-alpine in /webapp
Bumps node from 13.4.0-alpine to 13.5.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-20 04:18:47 +00:00
dependabot-preview[bot]
3816e79b6d
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp
Bumps node from 13.3.0-alpine to 13.4.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-19 04:20:21 +00:00
dependabot-preview[bot]
232787d412
build(deps): bump node from 13.1.0-alpine to 13.3.0-alpine in /webapp
Bumps node from 13.1.0-alpine to 13.3.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 09:14:16 +00:00
dependabot-preview[bot]
36ef2d9c96
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp
Bumps node from 13.0.1-alpine to 13.1.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-16 19:43:41 +00:00
dependabot-preview[bot]
2c4416c2ee
build(deps): bump node from 12.13.0-alpine to 13.0.1-alpine in /webapp
Bumps node from 12.13.0-alpine to 13.0.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 08:07:10 +00:00
mattwr18
821ea6d671 Update LocaleSwitch with guard clause
- return if there is no currentUser
- do not copy graphql directory as there is no need to send messages to
backend
2019-10-24 12:45:55 +02:00
roschaefer
9d522353cc fix: import missing files in maintenance image
@ogerly the maintenance page needs just two components of the webapp
folder. For that reason we import only these. If you add imports to
`LocaleSwitch` component, you need to copy those files in the
Dockerfile.
2019-10-24 11:14:22 +02:00
dependabot-preview[bot]
065dbcf50a
build(deps): bump node from 12.12.0-alpine to 12.13.0-alpine in /webapp
Bumps node from 12.12.0-alpine to 12.13.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 04:25:00 +00:00
dependabot-preview[bot]
b5d0170ab4
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /webapp
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-15 08:53:30 +00:00
dependabot-preview[bot]
390e073acd
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /webapp
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-08 05:03:33 +00:00
dependabot-preview[bot]
1d5f4f2868
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /webapp
Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 04:30:07 +00:00
roschaefer
f3a9996962 Copy package.json from webapp/
This will install the dependencies of the webapp/ folder first and then
overwrite the package.json to use different scripts. If we would track
dependencies in a separate package.json we would have to update it
with dependabot. We don't want that because of our precious build
server time.
2019-09-11 08:43:26 +02:00
roschaefer
d6b7374ddb Change strategy, only build docker image
I couldnt' get the local build to run with the alternative
`nuxt.config.js`. So I'm building docker only now.
2019-09-11 08:43:26 +02:00