Explorar el Código

Se cambia repositorio de hook

Maximiliano Schvindt hace 6 años
padre
commit
9921dc236d
Se han modificado 2 ficheros con 2 adiciones y 4 borrados
  1. 1 4
      1.4.0/kea-ik/Dockerfile
  2. 1 0
      1.4.0/kea-ik/script.sh

+ 1 - 4
1.4.0/kea-ik/Dockerfile

@@ -4,7 +4,7 @@ FROM docker.infra.flowdat.com/fd3/kea-oss-1.4.0:latest
 
 
 RUN git clone git://github.com/alanxz/rabbitmq-c.git
 RUN git clone git://github.com/alanxz/rabbitmq-c.git
 RUN apt-get update && apt-get install -yq cmake
 RUN apt-get update && apt-get install -yq cmake
-RUN cd rabbitmq-c && mkdir build && cd build && cmake .. && cmake --build . 
+RUN cd rabbitmq-c && mkdir build && cd build && cmake .. && cmake --build .
 RUN cd rabbitmq-c/build && make  && make install
 RUN cd rabbitmq-c/build && make  && make install
 
 
 RUN git clone https://github.com/akalend/amqpcpp
 RUN git clone https://github.com/akalend/amqpcpp
@@ -29,9 +29,6 @@ RUN mkdir ~/.ssh
 RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
 COPY keys/ /opt/keys
 COPY keys/ /opt/keys
 RUN chmod 0600 /opt/keys/bitbucket.id_rsa
 RUN chmod 0600 /opt/keys/bitbucket.id_rsa
-RUN eval $(ssh-agent) && ssh-add /opt/keys/bitbucket.id_rsa && git clone git@bitbucket.org:ikflowdat/kea-cm-hook.git
-
-RUN cd kea-cm-hook && git checkout kea-test && make
 
 
 COPY inotify.sh /usr/local/etc/kea/inotify.sh
 COPY inotify.sh /usr/local/etc/kea/inotify.sh
 
 

+ 1 - 0
1.4.0/kea-ik/script.sh

@@ -11,5 +11,6 @@ kea-admin lease-init mysql -h mysql -u $MYSQL_USER -p $MYSQL_ROOT_PASSWORD -n $D
 
 
 cd /opt/hooks/amqp && make
 cd /opt/hooks/amqp && make
 cd /opt/hooks/mysql && make
 cd /opt/hooks/mysql && make
+cd /opt/hooks/kea-cm-hook && make
 
 
 supervisord --configuration /etc/supervisord/supervisor.conf  --nodaemon
 supervisord --configuration /etc/supervisord/supervisor.conf  --nodaemon