Merge branch 'develop' of github.com:thecodingmachine/workadventure into refactor_wokas

back/Dockerfile

@@ -1,16 +1,22 @@
+# The building of ProtoBuf "messages" must be done out of Docker because grpc-node does not ship with ARM64 binaries.
+# See: https://github.com/grpc/grpc-node/issues/1405
+# When the issue above is closed, we can move back messages building inside Dockerfile
+
 # protobuf build
-FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as builder
-WORKDIR /usr/src
-COPY messages .
-RUN yarn install && yarn proto
+#FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as proto-builder
+#WORKDIR /usr/src
+#COPY messages/yarn.lock messages/package.json ./
+#RUN yarn install
+#COPY messages .
+#RUN yarn proto
 
 # typescript build
-FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as builder2
+FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as builder
 WORKDIR /usr/src
 COPY back/yarn.lock back/package.json ./
 RUN yarn install
 COPY back .
-COPY --from=builder /usr/src/generated src/Messages/generated
+#COPY --from=proto-builder /usr/src/generated src/Messages/generated
 ENV NODE_ENV=production
 RUN yarn run tsc
 
@@ -18,9 +24,9 @@ RUN yarn run tsc
 FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d
 WORKDIR /usr/src
 COPY back/yarn.lock back/package.json ./
-COPY --from=builder2 /usr/src/dist /usr/src/dist
 ENV NODE_ENV=production
 RUN yarn install --production
+COPY --from=builder /usr/src/dist /usr/src/dist
 
 USER node
 CMD ["yarn", "run", "runprod"]

back/src/Services/MapFetcher.ts

@@ -43,6 +43,15 @@ class MapFetcher {
      * @private
      */
     async isLocalUrl(url: string): Promise<boolean> {
+        if (
+            url ===
+            "http://play.workadventure.localhost/_/global/maps.workadventure.localhost/tests/Variables/shared_variables.json"
+        ) {
+            // This is an ugly exception case needed for the E2E test at "tests/tests/variables.spec.ts"
+            // Otherwise, we cannot test locally maps that are... not local.
+            return false;
+        }
+
         const urlObj = new URL(url);
         if (urlObj.hostname === "localhost" || urlObj.hostname.endsWith(".localhost")) {
             return true;