From e624955a2880a5b0af68213891ab19aae9bb9dba Mon Sep 17 00:00:00 2001
From: gregor <e@tokarev.work>
Date: Wed, 10 May 2023 13:52:46 +0300
Subject: [PATCH 1/4] CU-85zt0e0vw add script for building emails

---
 .gitignore              |  3 ++-
 scripts/build-emails.sh | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 scripts/build-emails.sh

diff --git a/.gitignore b/.gitignore
index 0d7a7833..8649d0ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,4 +136,5 @@ dmypy.json
 cache
 
 static
-staticfiles
\ No newline at end of file
+staticfiles
+/emails/
\ No newline at end of file
diff --git a/scripts/build-emails.sh b/scripts/build-emails.sh
new file mode 100644
index 00000000..a20f2c12
--- /dev/null
+++ b/scripts/build-emails.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# In order to use this script
+# machine should have installed:
+# - git
+# - node^16
+
+cd ..
+git clone git@github.com:PROCOLLAB-github/emails.git
+cd emails || exit
+
+npm ci
+npm run build
+
+cd ..
+cp -R ./emails/dist ./email
+rm -rf ./emails
\ No newline at end of file

From 131b0a8cdc0a838f9ec91674f425659a1e7730e8 Mon Sep 17 00:00:00 2001
From: gregor <e@tokarev.work>
Date: Wed, 10 May 2023 17:40:52 +0300
Subject: [PATCH 2/4] CU-85zt0e0vw add emails to docker builds

---
 Dockerfile              | 13 +++++++++++++
 scripts/build-emails.sh |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 35db333e..729b699e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,13 @@
+FROM node:16 as emails
+
+RUN mkdir build
+WORKDIR /build
+
+COPY ./scripts ./scripts
+
+RUN ["chmod", "+x", "./scripts/build-emails.sh"]
+RUN bash ./scripts/build-emails.sh
+
 FROM python:3.9
 
 RUN apt update --no-install-recommends -y
@@ -18,9 +28,12 @@ WORKDIR /procollab
 
 COPY poetry.lock pyproject.toml /procollab/
 
+
 RUN poetry config virtualenvs.create false \
     && poetry install  --no-root
 
+COPY --from=emails /email ./emails/
+
 EXPOSE 8000
 
 RUN mkdir /procollab/staticfiles
diff --git a/scripts/build-emails.sh b/scripts/build-emails.sh
index a20f2c12..6c1e15d3 100644
--- a/scripts/build-emails.sh
+++ b/scripts/build-emails.sh
@@ -6,7 +6,7 @@
 # - node^16
 
 cd ..
-git clone git@github.com:PROCOLLAB-github/emails.git
+git clone https://github.com/PROCOLLAB-github/emails.git
 cd emails || exit
 
 npm ci

From 7822cf20e8e6d65b2831f6fd3bea4d287b75c51c Mon Sep 17 00:00:00 2001
From: gregor <e@tokarev.work>
Date: Wed, 10 May 2023 17:42:32 +0300
Subject: [PATCH 3/4] CU-85zt0e0vw add dockerignore file

all folders listed in dockerignore was copied in image builds
---
 .dockerignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..df9ca0ad
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.idea/
+.git/
+.github/
\ No newline at end of file

From 746e387f453a90f998ef05adcf6e3f5a8db8bd80 Mon Sep 17 00:00:00 2001
From: gregor <e@tokarev.work>
Date: Wed, 10 May 2023 17:44:31 +0300
Subject: [PATCH 4/4] CU-85zt0e0vw move startup.sh in scripts folder

---
 Dockerfile                       | 2 +-
 startup.sh => scripts/startup.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename startup.sh => scripts/startup.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 729b699e..d2169ec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,5 +41,5 @@ RUN mkdir /procollab/static
 
 COPY . /procollab/
 
-CMD ["bash", "startup.sh"]
+CMD ["bash", "./scripts/startup.sh"]
 
diff --git a/startup.sh b/scripts/startup.sh
similarity index 100%
rename from startup.sh
rename to scripts/startup.sh