diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 930c017..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0dda005..d21ab2d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b4a4416..4620587 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,16 +5,17 @@
-
+
+
-
-
-
-
+
+
+
+
@@ -52,7 +53,10 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"ignore.virus.scanning.warn.message": "true",
- "last_opened_file_path": "D:/mager/Documents/IntelliJ/Docker-Flask-QR/Dockerfile-RasPi"
+ "last_opened_file_path": "D:/mager/Documents/IntelliJ/Docker-Flask-QR/Dockerfile-RasPi",
+ "project.structure.last.edited": "SDKs",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.2"
}
}
@@ -61,6 +65,7 @@
+
diff --git a/Docker-Flask-QR.iml b/Docker-Flask-QR.iml
index 5b1310a..b25a585 100644
--- a/Docker-Flask-QR.iml
+++ b/Docker-Flask-QR.iml
@@ -2,7 +2,9 @@
-
+
+
+
diff --git a/Dockerfile b/Dockerfile
index 2de38e1..f41cb70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,7 @@ LABEL version="1.0"
LABEL description="Simple QR-Code-Generator-Server"
WORKDIR /app
-RUN mkdir templates
-COPY ./templates /app/templates/
-COPY ./Flask-QR.py ./requirements.txt /app/
+COPY ./app /app/
#RUN pip install --upgrade pip
RUN pip install --trusted-host pypi.python.org -r requirements.txt
diff --git a/Dockerfile-RasPi b/Dockerfile-RasPi
index 50ecc8a..e3b7d86 100644
--- a/Dockerfile-RasPi
+++ b/Dockerfile-RasPi
@@ -5,12 +5,9 @@ LABEL version="1.0"
LABEL description="Simple QR-Code-Generator-Server"
WORKDIR /app
+COPY ./app /app/
-RUN mkdir templates
-COPY ./templates /app/templates/
-COPY ./Flask-QR.py ./requirements.txt /app/
-
-RUN apt-get update && apt-get install -y zlib1g-dev libjpeg-dev libpng-dev gcc
+RUN apt-get update && apt-get install -y gcc zlib1g-dev libjpeg-dev
#RUN python -m pip install --upgrade pip
#RUN python -m pip install --upgrade pillow
RUN pip install --trusted-host pypi.python.org -r requirements.txt
diff --git a/Flask-QR.py b/app/Flask-QR.py
similarity index 100%
rename from Flask-QR.py
rename to app/Flask-QR.py
diff --git a/requirements.txt b/app/requirements.txt
similarity index 66%
rename from requirements.txt
rename to app/requirements.txt
index 6056ed4..ced55d8 100644
--- a/requirements.txt
+++ b/app/requirements.txt
@@ -1,2 +1 @@
-Flask
Flask-QRcode
\ No newline at end of file
diff --git a/templates/index.html b/app/templates/index.html
similarity index 100%
rename from templates/index.html
rename to app/templates/index.html
diff --git a/templates/qr.html b/app/templates/qr.html
similarity index 100%
rename from templates/qr.html
rename to app/templates/qr.html