Przeglądaj źródła

Update Dockerfile

Espinoza Guillermo 6 lat temu
rodzic
commit
8299e2cdae
4 zmienionych plików z 7 dodań i 5 usunięć
  1. 2 1
      1.3.0/Dockerfile
  2. 2 2
      1.3.0/hook/dhcp/Makefile
  3. 2 1
      1.4.0/Dockerfile
  4. 1 1
      1.4.0/hook/dhcp/Makefile

+ 2 - 1
1.3.0/Dockerfile

@@ -41,9 +41,10 @@ RUN cd rabbitmq-c/build && make  && make install
 RUN git clone https://github.com/akalend/amqpcpp
 RUN cd amqpcpp && make && make install
 
-RUN cp /usr/local/lib/x86_64-linux-gnu/librabbitmq.so /usr/local/lib/librabbitmq.so
+RUN cp /usr/local/lib/x86_64-linux-gnu/librabbitmq.* /usr/local/lib/
 RUN cp amqpcpp/libamqpcpp.a /usr/local/lib/libamqpcpp.a
 RUN cp amqpcpp/libamqpcpp.so /usr/local/lib/libamqpcpp.so
+RUN ldconfig
 
 COPY hook/ hook/
 RUN cd hook/dhcp && make

+ 2 - 2
1.3.0/hook/dhcp/Makefile

@@ -6,8 +6,8 @@ KEA_LIB ?= /opt/kea/lib/
 OBJECTS = src/messages.o src/logger.o src/load.o src/callouts.o src/version.o src/amqppublisher.o
 DEPS = $(OBJECTS:.o=.d)
 CXXFLAGS = -I $(KEA_INCLUDE) -g -fPIC -Wno-deprecated -std=c++11
-LDFLAGS = -L/usr/local/lib -L $(KEA_LIB) -shared
-LIBRARIES = -lkea-dhcpsrv -lkea-dhcp++ -lkea-hooks -lkea-log -lkea-util -lkea-exceptions -lamqpcpp -lrabbitmq
+LDFLAGS = -L $(KEA_LIB) -shared
+LIBRARIES = -lkea-dhcpsrv -lkea-dhcp++ -lkea-hooks -lkea-log -lkea-util -lkea-exceptions -lamqpcpp -lrabbitmq 
 
 kea-hook-flowdat3.so: $(OBJECTS)
 	$(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)

+ 2 - 1
1.4.0/Dockerfile

@@ -41,9 +41,10 @@ RUN cd rabbitmq-c/build && make  && make install
 RUN git clone https://github.com/akalend/amqpcpp
 RUN cd amqpcpp && make && make install
 
-RUN cp /usr/local/lib/x86_64-linux-gnu/librabbitmq.so /usr/local/lib/librabbitmq.so
+RUN cp /usr/local/lib/x86_64-linux-gnu/librabbitmq.* /usr/local/lib/
 RUN cp amqpcpp/libamqpcpp.a /usr/local/lib/libamqpcpp.a
 RUN cp amqpcpp/libamqpcpp.so /usr/local/lib/libamqpcpp.so
+RUN ldconfig
 
 COPY hook/ hook/
 RUN cd hook/dhcp && make

+ 1 - 1
1.4.0/hook/dhcp/Makefile

@@ -6,7 +6,7 @@ KEA_LIB ?= /opt/kea/lib/
 OBJECTS = src/messages.o src/logger.o src/load.o src/callouts.o src/version.o src/amqppublisher.o
 DEPS = $(OBJECTS:.o=.d)
 CXXFLAGS = -I $(KEA_INCLUDE) -g -fPIC -Wno-deprecated -std=c++11
-LDFLAGS = -L/usr/local/lib -L $(KEA_LIB) -shared
+LDFLAGS = -L $(KEA_LIB) -shared
 LIBRARIES = -lkea-dhcpsrv -lkea-dhcp++ -lkea-hooks -lkea-log -lkea-util -lkea-exceptions -lamqpcpp -lrabbitmq
 
 kea-hook-flowdat3.so: $(OBJECTS)