BinaryONe
commited on
Commit
·
fad515f
1
Parent(s):
f5ad5fe
InitialCommit -Modification in Dockerfile
Browse files- Dockerfile +4 -2
- start_apps.sh +0 -14
- start_pyapps.sh +8 -0
- start_services.sh +7 -0
Dockerfile
CHANGED
@@ -14,7 +14,9 @@ RUN apk update && \
|
|
14 |
# Copy Flask application
|
15 |
COPY ./FlaskWebApp /app/FlaskWebApp
|
16 |
COPY ./requirements.txt /app/requirements.txt
|
17 |
-
|
|
|
|
|
18 |
|
19 |
# Copy Angular build files to Nginx web directory
|
20 |
ADD ./resources.tar /var/www/portfolio
|
@@ -39,4 +41,4 @@ RUN touch /app/flask.log && \
|
|
39 |
|
40 |
USER app_user
|
41 |
|
42 |
-
CMD ["sh","-c","/app/
|
|
|
14 |
# Copy Flask application
|
15 |
COPY ./FlaskWebApp /app/FlaskWebApp
|
16 |
COPY ./requirements.txt /app/requirements.txt
|
17 |
+
|
18 |
+
COPY ./start_pyapps.sh /app/start_pyapps.sh
|
19 |
+
COPY ./start_services.sh /app/start_services.sh
|
20 |
|
21 |
# Copy Angular build files to Nginx web directory
|
22 |
ADD ./resources.tar /var/www/portfolio
|
|
|
41 |
|
42 |
USER app_user
|
43 |
|
44 |
+
CMD ["sh","-c","/app/start_services.sh"]
|
start_apps.sh
DELETED
@@ -1,14 +0,0 @@
|
|
1 |
-
#!/bin/sh
|
2 |
-
|
3 |
-
# Start nginx in a separate shell (background)
|
4 |
-
echo "* Starting The Python Application *";
|
5 |
-
(
|
6 |
-
echo "* Activating virtual environment *PWD $(pwd) *";
|
7 |
-
source /app/PyEnv/bin/activate ;
|
8 |
-
echo "* Starting application *PWD $(pwd)*";
|
9 |
-
cd /app || { echo "Failed to change directory to /app"; exit 1; } ;
|
10 |
-
python3 -u -m FlaskWebApp || { echo "Failed to start WebSSH application"; exit 1; > /dev/stdout; } > /app/flask.log 2>&1 ;
|
11 |
-
echo "* Application started as USER: $(whoami)*"; > /dev/stdout;
|
12 |
-
)
|
13 |
-
echo "* Starting The NGINX *";
|
14 |
-
nginx -g "daemon off;" > /dev/stdout; #> /app/nginx.log 2>&1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
start_pyapps.sh
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/bin/sh
|
2 |
+
|
3 |
+
echo "* Activating virtual environment *PWD $(pwd) *";
|
4 |
+
source /app/PyEnv/bin/activate ;
|
5 |
+
echo "* Starting application *PWD $(pwd)*";
|
6 |
+
cd /app || { echo "Failed to change directory to /app"; exit 1; } ;
|
7 |
+
python3 -u -m FlaskWebApp || { echo "Failed to start WebSSH application"; exit 1;} > /app/flask.log 2>&1 ;
|
8 |
+
echo "* Application started as USER: $(whoami)*";
|
start_services.sh
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/bin/sh
|
2 |
+
|
3 |
+
# Start nginx in a separate shell (background)
|
4 |
+
echo "* Starting The Python Application *";
|
5 |
+
bash -c "/app/start_pyapps.sh; exec bash";
|
6 |
+
echo "* Starting The NGINX *";
|
7 |
+
nginx -g "daemon off;" > /dev/stdout;
|