From 896738dc228273426dae1dcc587391e30ab29147 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Jul 2021 21:10:47 +0530 Subject: [PATCH 1/2] Fixed login username regex --- src/app/templates/auth/Auth.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/templates/auth/Auth.jsx b/src/app/templates/auth/Auth.jsx index 2be50fc..cd287e2 100644 --- a/src/app/templates/auth/Auth.jsx +++ b/src/app/templates/auth/Auth.jsx @@ -13,7 +13,7 @@ import Spinner from '../../atoms/spinner/Spinner'; import CinnySvg from '../../../../public/res/svg/cinny.svg'; -const USERNAME_REGEX = /^[a-z0-9_-]+$/; +const USERNAME_REGEX = /^[a-z0-9_\-.=/]+$/; const BAD_USERNAME_ERROR = 'Username must contain only lowercase letters, numbers, dashes and underscores.'; const PASSWORD_REGEX = /.+/; From 313ff8e184008ff9fd8ad032267973625432f671 Mon Sep 17 00:00:00 2001 From: William Kray Date: Wed, 28 Jul 2021 12:43:47 -0700 Subject: [PATCH 2/2] add dockerfile which builds a cinny container served by nginx --- Dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c4bd5a4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +## Builder +FROM node:14-alpine as builder + +WORKDIR /src + +COPY . /src +RUN npm install \ + && npm run build + + +## App +FROM nginx:alpine + +COPY --from=builder /src/dist /app +COPY --from=builder /src/olm.wasm /app/olm.wasm + +# Insert wasm type into Nginx mime.types file so they load correctly. +RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types + +RUN rm -rf /usr/share/nginx/html \ + && ln -s /app /usr/share/nginx/html