racorus commited on
Commit
41c3aa2
·
verified ·
1 Parent(s): b6c90e9

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +13 -9
Dockerfile CHANGED
@@ -12,8 +12,10 @@ RUN apt-get update && apt-get install -y \
12
  wget \
13
  python3 \
14
  python3-pip \
15
- docker.io \
16
- docker-compose \
 
 
17
  && apt-get clean
18
 
19
  # Install Node.js
@@ -31,21 +33,23 @@ RUN chmod -R 755 /webodm
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"]
 
12
  wget \
13
  python3 \
14
  python3-pip \
15
+ redis-server \
16
+ postgresql \
17
+ postgresql-contrib \
18
+ libpq-dev \
19
  && apt-get clean
20
 
21
  # Install Node.js
 
33
 
34
  # Ensure the user has the correct permissions
35
  RUN useradd -m webodmuser
36
+ RUN chown -R webodmuser:webodm
37
  USER webodmuser
38
 
39
+ # Install WebODM dependencies
40
+ RUN ./webodm.sh update
41
+
42
  # Expose the default WebODM port
43
  EXPOSE 8000
44
 
45
+ # Create a start script to run necessary services and WebODM
 
 
 
46
  RUN echo '#!/bin/bash\n\
47
+ sudo service redis-server start\n\
48
+ sudo service postgresql start\n\
49
+ ./webodm.sh start --force-yes\n\
50
  tail -f /dev/null' > /webodm/start.sh
51
 
52
  RUN chmod +x /webodm/start.sh
53
 
54
+ # Start services and WebODM
55
  CMD ["/webodm/start.sh"]