Luciano Andrade 8 лет назад
Родитель
Сommit
4f175cc28d
2 измененных файлов с 8 добавлено и 3 удалено
  1. 6 1
      docker-compose.yml
  2. 2 2
      supervisord/Dockerfile

+ 6 - 1
docker-compose.yml

@@ -45,8 +45,10 @@ services:
     image: mysql:5.7
 
   amqp:
-    image: rabbitmq
+    image: rabbitmq:3-management
     restart: always
+    ports:
+      - "8072:15672"
   
   ftth_worker:
     image: fd3-ftth
@@ -81,10 +83,13 @@ services:
       context: supervisord
     ports:
       - "9001:9001"
+    privileged: true
     volumes: 
       - ./supervisord/:/etc/supervisord/
       - ./supervisord/var/:/var/log/supervisor/
       - ./supervisord/sshd_config:/etc/ssh/sshd_config
+      - ./supervisord/bin/fiberhome:/usr/bin/fiberhome
+      - ./supervisord/bin/fiberlink:/usr/bin/fiberlink
     environment:
       TERM: "xterm"
  

+ 2 - 2
supervisord/Dockerfile

@@ -1,6 +1,6 @@
 ##################################################################
 FROM debian:8.0
-RUN apt-get update && apt-get install -yq parallel git vim tmux python-pip lockfile-progs
+RUN apt-get update && apt-get install -yq parallel git vim tmux python-pip lockfile-progs expect telnet
 RUN pip install supervisor
 
 RUN mkdir -p /var/log/supervisor/
@@ -32,5 +32,5 @@ RUN chown root:root -R /etc/ssh/keys
 EXPOSE 22
 ##################################################################
 
-CMD (echo supervisord --configuration  /etc/supervisord/supervisor.conf  --nodaemon; echo /usr/sbin/sshd -D) | parallel
+CMD bash -c "/usr/sbin/sshd ; while true; do supervisord --configuration /etc/supervisord/supervisor.conf  --nodaemon ; sleep 5 ; done"