Update Dockerfile
Browse files- Dockerfile +9 -11
Dockerfile
CHANGED
|
@@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y \
|
|
| 12 |
wget \
|
| 13 |
python3 \
|
| 14 |
python3-pip \
|
| 15 |
-
|
| 16 |
-
|
| 17 |
&& apt-get clean
|
| 18 |
|
| 19 |
# Install Node.js
|
|
@@ -31,23 +31,21 @@ RUN chmod -R 755 /webodm
|
|
| 31 |
|
| 32 |
# Ensure the user has the correct permissions
|
| 33 |
RUN useradd -m webodmuser
|
| 34 |
-
RUN chown -R webodmuser:webodm
|
| 35 |
USER webodmuser
|
| 36 |
|
| 37 |
-
# Install WebODM dependencies
|
| 38 |
-
RUN ./webodm.sh update
|
| 39 |
-
|
| 40 |
# Expose the default WebODM port
|
| 41 |
EXPOSE 8000
|
| 42 |
|
| 43 |
-
#
|
|
|
|
|
|
|
|
|
|
| 44 |
RUN echo '#!/bin/bash\n\
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
./webodm.sh start --force-yes\n\
|
| 48 |
tail -f /dev/null' > /webodm/start.sh
|
| 49 |
|
| 50 |
RUN chmod +x /webodm/start.sh
|
| 51 |
|
| 52 |
-
# Start services and WebODM
|
| 53 |
CMD ["/webodm/start.sh"]
|
|
|
|
| 12 |
wget \
|
| 13 |
python3 \
|
| 14 |
python3-pip \
|
| 15 |
+
docker.io \
|
| 16 |
+
docker-compose \
|
| 17 |
&& apt-get clean
|
| 18 |
|
| 19 |
# Install Node.js
|
|
|
|
| 31 |
|
| 32 |
# Ensure the user has the correct permissions
|
| 33 |
RUN useradd -m webodmuser
|
| 34 |
+
RUN chown -R webodmuser:webodmuser /webodm
|
| 35 |
USER webodmuser
|
| 36 |
|
|
|
|
|
|
|
|
|
|
| 37 |
# Expose the default WebODM port
|
| 38 |
EXPOSE 8000
|
| 39 |
|
| 40 |
+
# Start WebODM services
|
| 41 |
+
CMD ["./webodm.sh", "start"]
|
| 42 |
+
|
| 43 |
+
# Fix: Run docker-compose as part of the startup
|
| 44 |
RUN echo '#!/bin/bash\n\
|
| 45 |
+
./webodm.sh start --detach\n\
|
| 46 |
+
docker-compose -f docker-compose.yml -f docker-compose.nodeodm.yml up --scale node-odm=1\n\
|
|
|
|
| 47 |
tail -f /dev/null' > /webodm/start.sh
|
| 48 |
|
| 49 |
RUN chmod +x /webodm/start.sh
|
| 50 |
|
|
|
|
| 51 |
CMD ["/webodm/start.sh"]
|