build: Fix VPP config for VPP 20.09 (#1799)

Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
ligato · Apr 23, 2021 · bd7edfd · bd7edfd
1 parent 843b3ec
commit bd7edfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
@@ -110,8 +110,10 @@ COPY ./docker/dev/init_hook.sh /usr/bin/
 # handle differences in vpp.conf which are between supported VPP versions
 ARG VPP_VERSION
 COPY ./docker/dev/legacy-nat.conf /tmp/legacy-nat.conf
-RUN bash -c "if [[ \"$VPP_VERSION\" < "2101" ]]; then cat /tmp/legacy-nat.conf >> /etc/vpp/vpp.conf; fi"
-RUN rm /tmp/legacy-nat.conf
+RUN if [[ "$VPP_VERSION" < "2009" ]]; then \
+		cat /tmp/legacy-nat.conf >> /etc/vpp/vpp.conf; \
+	fi; \
+	rm /tmp/legacy-nat.conf
 
 # Install agent
 WORKDIR /src/ligato/vpp-agent

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
@@ -42,8 +42,10 @@ COPY init_hook.sh /usr/bin/
 # handle differences in vpp.conf which are between supported VPP versions
 ARG VPP_VERSION
 COPY legacy-nat.conf /tmp/legacy-nat.conf
-RUN bash -c "if [[ \"$VPP_VERSION\" < "2101" ]]; then cat /tmp/legacy-nat.conf >> /etc/vpp/vpp.conf; fi"
-RUN rm /tmp/legacy-nat.conf
+RUN if [[ "$VPP_VERSION" < "2009" ]]; then \
+		cat /tmp/legacy-nat.conf >> /etc/vpp/vpp.conf; \
+	fi; \
+	rm /tmp/legacy-nat.conf
 
 # Install agent
 COPY --from=devimg \