Commit Graph

4611 Commits

Author SHA1 Message Date
Lukas 2938aba484 Multi-platform images (#1924)
* base front production image on official nginx

* build multi-platform docker images

* build message types outside docker

* set docker build context to path

* build message types before running e2e tests

* add build for arm/v7

* remove build for arm/v7

* increase yarn network timeout

* set front port to 80

* add git labels to images

https://github.com/docker/build-push-action/blob/master/UPGRADE.md#tags-with-ref-and-git-labels

* add images input

* Adding back commented code in the Dockerfile (the protobuf message building).

This way, when node-grpc supports ARM64, we can uncomment the code again.

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Lukas Hass @lukashass
2022-03-08 11:21:17 +01:00
_Bastler bc33d88726 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-07 19:06:17 +01:00
David Négrier 7114be9a65 Merge pull request #1947 from thecodingmachine/parallel-build
Using parallel build in end to end tests
2022-03-07 19:02:18 +01:00
David Négrier 79aa417d10 Merge pull request #1946 from thecodingmachine/electron
Marking Electron app as alpha
2022-03-07 18:50:55 +01:00
David Négrier 560be9b0d6 Using parallel build in end to end tests
The docker-compose build used in E2E tests was running builds sequentially.
This is an attempt to run the builds in parallel to optimize the E2E startup time.
Before this commit, the "Start WorkAdventure" step takes 7m11 on GitHub
2022-03-07 18:50:17 +01:00
David Négrier 07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
David Négrier ace7a684dc Adding "alpha" to the window Title 2022-03-07 18:10:26 +01:00
Alexis Faizeau 9300b05335 Fix woka list url 2022-03-04 10:52:32 +01:00
_Bastler 8c2eec87c7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-04 08:20:25 +01:00
Hanusiak Piotr 3c74b2b554 remove obsolete check 2022-03-03 15:21:44 +01:00
Hanusiak Piotr ba612c49ed fix GameRoom text 2022-03-03 14:47:42 +01:00
Anton Bracke 4535a8ae96 Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Hanusiak Piotr 363b906cb8 group circles with color fill 2022-03-03 14:36:16 +01:00
Hanusiak Piotr 5706e5c416 remove console logs 2022-03-03 12:31:17 +01:00
Hanusiak Piotr a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +01:00
Valdo Romao 1181187271 Fixed discord links 2022-02-28 21:07:36 +01:00
_Bastler e87052ecc6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 19:12:42 +01:00
grégoire parant 9173a30f04 Merge pull request #1934 from thecodingmachine/oidcProfile
add OIDC username + locale
2022-02-28 15:18:47 +01:00
Lurkars c8047bf4fa change to scope variable in enviroment 2022-02-28 14:56:44 +01:00
_Bastler 6faa31427b fix iframe 2022-02-28 14:52:44 +01:00
_Bastler c2c01eb314 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:20:52 +01:00
_Bastler 653287bf78 fix prod. 2022-02-28 14:20:44 +01:00
_Bastler ae376f25c4 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:16:09 +01:00
Hanusiak Piotr 724dbc8efa send group userIds to players 2022-02-28 13:47:08 +01:00
Alexis Faizeau 4091606f75 Remove async on pusher option method 2022-02-28 12:09:15 +01:00
Lurkars 0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
_Bastler 946a4d75e9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 09:20:50 +01:00
Lurkars c3b3d5e9d6 Fix nginx.conf to work with OIDC (#1932)
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
2022-02-28 09:07:38 +01:00
_Bastler 8bc66723d5 fix nginx.conf 2022-02-27 14:52:57 +01:00
_Bastler c12582c329 fix nginx.conf 2022-02-27 14:52:13 +01:00
_Bastler 51719660d9 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-27 14:39:42 +01:00
_Bastler d3df66b615 merge develop_vite 2022-02-27 14:39:06 +01:00
_Bastler 86dc0d4aa8 add DOMPurify 2022-02-27 14:37:26 +01:00
_Bastler 9e86e95135 merge latest dev 2022-02-27 14:19:39 +01:00
_Bastler 2622041740 orig. formatting 2022-02-27 13:59:05 +01:00
_Bastler 03ee2eb49a update dockerfile 2022-02-26 11:27:47 +01:00
_Bastler 36a4b140ba rename images 2022-02-26 11:19:48 +01:00
_Bastler 0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +01:00
Lukas f1cba60825 base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Alexis Faizeau 394f721638 Add position on default woka data 2022-02-25 19:28:21 +01:00
Lukas 3f3af9b957 improve docker build caching
install dependencies before copying source into image
2022-02-25 18:53:14 +01:00
David Négrier 08fffab410 Switching from "name" to "id" in texture object + using zod for woka/list validation 2022-02-25 17:05:34 +01:00
_Bastler 7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
David Négrier 3a9ce7615d Merge pull request #1914 from thecodingmachine/dependabot/npm_and_yarn/front/ansi-regex-5.0.1
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
2022-02-25 14:10:21 +01:00
David Négrier da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +01:00
grégoire parant 433f3ddd97 Merge pull request #1927 from thecodingmachine/calendar-meetings-doc
Documents the meetingRoomLabel property
2022-02-24 20:01:48 +01:00
grégoire parant 9da3c9c169 Merge pull request #1921 from thecodingmachine/fix-hash-parameter-from-standby
clear hashParams after moving player with moveTo param
2022-02-24 20:01:26 +01:00