chore: update consul version

holyspectral · Dec 21, 2024 · adacd3e · adacd3e
1 parent 7c68c08
commit adacd3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/package/Dockerfile.controller b/package/Dockerfile.controller
@@ -52,9 +52,12 @@ RUN mkdir -p /chroot/etc/neuvector/certs/internal/
 
 COPY package/deps /deps/
 
-ARG CONSUL_VERSION=1.20.1
-RUN curl -fL https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_${TARGETOS}_${TARGETARCH}.zip -o consul.zip \
-    && cat /deps/${TARGETOS}_${TARGETARCH}/consul.checksum | sha256sum --check --status && unzip consul.zip -d /chroot/usr/local/bin/
+RUN zypper addrepo https://download.opensuse.org/repositories/isv:SUSE:neuvector/15.6/isv:SUSE:neuvector.repo && \
+    rpm --import https://download.opensuse.org/repositories/isv:SUSE:neuvector/15.6/repodata/repomd.xml.key && \
+    zypper -n refresh && \
+    zypper --installroot /chroot install -y consul
+
+RUN mv /chroot/usr/bin/consul /chroot/usr/local/bin/consul
 
 ARG OPA_VERSION=v0.69.0
 RUN curl -fL https://github.com/open-policy-agent/opa/releases/download/${OPA_VERSION}/opa_${TARGETOS}_${TARGETARCH}_static -o opa \

diff --git a/package/Dockerfile.enforcer b/package/Dockerfile.enforcer
@@ -50,7 +50,9 @@ RUN zypper refresh && zypper --installroot /chroot -n in --no-recommends \
 RUN zypper addrepo https://download.opensuse.org/repositories/isv:SUSE:neuvector/15.6/isv:SUSE:neuvector.repo && \
     rpm --import https://download.opensuse.org/repositories/isv:SUSE:neuvector/15.6/repodata/repomd.xml.key && \
     zypper -n refresh && \
-    zypper --installroot /chroot install -y yq libhs5-vectorscan5 vectorscan-devel
+    zypper --installroot /chroot install -y yq libhs5-vectorscan5 vectorscan-devel consul
+
+RUN mv /chroot/usr/bin/consul /chroot/usr/local/bin/consul
 
 RUN zypper --installroot /chroot clean -a && \
     rm -rf /chroot/var/log/
@@ -59,10 +61,6 @@ RUN touch /chroot/usr/local/bin/.nvcontainer && mkdir -p /chroot/etc/neuvector/c
 
 COPY package/deps /deps/
 
-ARG CONSUL_VERSION=1.20.1
-RUN curl -fL https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_${TARGETARCH}.zip -o consul.zip \
-    && cat /deps/${TARGETOS}_${TARGETARCH}/consul.checksum | sha256sum --check --status && unzip consul.zip -d /chroot/usr/local/bin/
-
 RUN cd /usr/bin/ && rm -rf basename chcon chgrp chmod chown chroot cksum dd df dircolors dirname du install install-info join locale localedef mkdir mkfifo mknod mktemp paste pathchk readlink realpath sync smidiff smidump smilink smiquery smistrip smixlate tee tiemout tload top truncate unlink watch
 
 #