From fb35b82f092f17f8c20225026381ddc92a531c54 Mon Sep 17 00:00:00 2001
From: Mati-IR <mpabich4@gmail.com>
Date: Fri, 29 Dec 2023 10:37:27 +0100
Subject: [PATCH 1/6] Fixed FFMPEG installation issues

---
 api/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 6e014c6..39fe8f3 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -25,10 +25,10 @@ RUN echo "Oh dang look at that $INSTALL_FFMPEG"
 
 RUN if [ ${INSTALL_FFMPEG} = true ]; then \
     apt-get install -y ffmpeg \
+    RUN ffmpeg -version \
+    RUN ffmpeg -encoders \
+    RUN ffmpeg -decoders \
 ;fi
-RUN ffmpeg -version
-RUN ffmpeg -encoders
-RUN ffmpeg -decoders
 
 RUN apt-get install curl -y
 

From 34c78db6b139396fee1885426c5c51e3b83271bb Mon Sep 17 00:00:00 2001
From: Mati-IR <mpabich4@gmail.com>
Date: Fri, 29 Dec 2023 10:51:07 +0100
Subject: [PATCH 2/6] Updated python-poetry link

---
 api/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 39fe8f3..3697107 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -24,8 +24,8 @@ ARG INSTALL_FFMPEG=false
 RUN echo "Oh dang look at that $INSTALL_FFMPEG"
 
 RUN if [ ${INSTALL_FFMPEG} = true ]; then \
-    apt-get install -y ffmpeg \
-    RUN ffmpeg -version \
+    apt-get install -y ffmpeg \    
+RUN ffmpeg -version \
     RUN ffmpeg -encoders \
     RUN ffmpeg -decoders \
 ;fi
@@ -34,7 +34,7 @@ RUN apt-get install curl -y
 
 # Install Poetry
 RUN if [ ! -e /usr/local/bin/poetry ]; then \
-    curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
+    curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python && \
     cd /usr/local/bin && \
     ln -s /opt/poetry/bin/poetry && \
     poetry config virtualenvs.create false \

From caa04036ac09ecd1113ce69f326e6e4683f23788 Mon Sep 17 00:00:00 2001
From: Mati-IR <mpabich4@gmail.com>
Date: Fri, 29 Dec 2023 11:16:32 +0100
Subject: [PATCH 3/6] Modify INSTALL_FFMPEG to true and restore original
 sequence of commands

---
 api/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 3697107..064736c 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -20,15 +20,15 @@ RUN if [ ! -e /lib/libjpeg.so ]; then \
     ;fi
 
 # Install FFMPEG:
-ARG INSTALL_FFMPEG=false
+ARG INSTALL_FFMPEG=true
 RUN echo "Oh dang look at that $INSTALL_FFMPEG"
 
 RUN if [ ${INSTALL_FFMPEG} = true ]; then \
-    apt-get install -y ffmpeg \    
-RUN ffmpeg -version \
-    RUN ffmpeg -encoders \
-    RUN ffmpeg -decoders \
+    apt-get install -y ffmpeg \
 ;fi
+RUN ffmpeg -version 
+RUN ffmpeg -encoders
+RUN ffmpeg -decoders
 
 RUN apt-get install curl -y
 

From 1133bcb353ce98d1902e9f007736a260de3f061e Mon Sep 17 00:00:00 2001
From: Mati-IR <mpabich4@gmail.com>
Date: Fri, 29 Dec 2023 11:17:23 +0100
Subject: [PATCH 4/6] Updated readme regarding INSTALL_FFMPEG ARG in Dockerfile

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index eb5ea1e..e946128 100644
--- a/readme.md
+++ b/readme.md
@@ -73,7 +73,7 @@ To get a local copy up and running follow these simple example steps.
 1. Change docker-compose.dev.yml to docker-compose.yml
 2. 
 ```sh
-docker-compose build api
+docker compose build --build-arg INSTALL_FFMPEG=true api
 ```
 3. Start the service
 ```sh

From d13a8183e4b3f82cf8aaacee5311943bc0188a84 Mon Sep 17 00:00:00 2001
From: Mati-IR <mpabich4@gmail.com>
Date: Fri, 29 Dec 2023 11:24:24 +0100
Subject: [PATCH 5/6] Fix application startup by adding CORS_ORIGINS to
 docker-compose

---
 docker-compose.dev.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ad5931a..b3daf5b 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -13,4 +13,6 @@ services:
     ports:
       - 80:80
     expose:
-      - 80
\ No newline at end of file
+      - 80
+    environment:
+      - CORS_ORIGINS=*
\ No newline at end of file

From 91b8c017ae554a042d4a2509aa325d7a1ed289ee Mon Sep 17 00:00:00 2001
From: Mati-IR <mpabich4@gmail.com>
Date: Wed, 3 Jan 2024 12:42:48 +0100
Subject: [PATCH 6/6] Removed unnecessary changes

---
 api/Dockerfile         | 2 +-
 docker-compose.dev.yml | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 064736c..991b3ff 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -20,7 +20,7 @@ RUN if [ ! -e /lib/libjpeg.so ]; then \
     ;fi
 
 # Install FFMPEG:
-ARG INSTALL_FFMPEG=true
+ARG INSTALL_FFMPEG=false
 RUN echo "Oh dang look at that $INSTALL_FFMPEG"
 
 RUN if [ ${INSTALL_FFMPEG} = true ]; then \
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b3daf5b..ad5931a 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -13,6 +13,4 @@ services:
     ports:
       - 80:80
     expose:
-      - 80
-    environment:
-      - CORS_ORIGINS=*
\ No newline at end of file
+      - 80
\ No newline at end of file