Updated dockerfiles to install flex & bison using apk

CDOT-CV · Jan 11, 2024 · 213ef71 · 213ef71
1 parent 0533d94
commit 213ef71
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,20 +17,16 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \
     libtool \
     autoconf \
     librdkafka \
-    librdkafka-dev
+    librdkafka-dev \
+    flex \
+    bison
 
 # Install pugixml
 ADD ./pugixml /asn1_codec/pugixml
 RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install
 
 # Build and install asn1c submodule
 ADD ./asn1c /asn1_codec/asn1c
-RUN apt-get -y install automake libtool flex
-RUN wget http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb
-RUN wget http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb
-RUN dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb
-RUN dpkg -i bison_2.7.1.dfsg-1_amd64.deb
-RUN apt-mark hold libbison-dev bison
 RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install
 
 # Generate ASN.1 API.

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -17,20 +17,16 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \
     libtool \
     autoconf \
     librdkafka \
-    librdkafka-dev
+    librdkafka-dev \
+    flex \
+    bison
 
 # Install pugixml
 ADD ./pugixml /asn1_codec/pugixml
 RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install
 
 # Build and install asn1c submodule
 ADD ./asn1c /asn1_codec/asn1c
-RUN apt-get -y install automake libtool flex
-RUN wget http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb
-RUN wget http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb
-RUN dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb
-RUN dpkg -i bison_2.7.1.dfsg-1_amd64.deb
-RUN apt-mark hold libbison-dev bison
 RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install
 
 # Generate ASN.1 API.

diff --git a/Dockerfile.standalone b/Dockerfile.standalone
@@ -16,20 +16,16 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \
     libtool \
     autoconf \
     librdkafka \
-    librdkafka-dev
+    librdkafka-dev \
+    flex \
+    bison
 
 # Install pugixml
 ADD ./pugixml /asn1_codec/pugixml
 RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install
 
 # Build and install asn1c submodule
 ADD ./asn1c /asn1_codec/asn1c
-RUN apt-get -y install automake libtool flex
-RUN wget http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb
-RUN wget http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb
-RUN dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb
-RUN dpkg -i bison_2.7.1.dfsg-1_amd64.deb
-RUN apt-mark hold libbison-dev bison
 RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install
 
 # Generate ASN.1 API.