fix: move the install to the main Docker image

elastic · Jan 26, 2024 · 9c69f3a · 9c69f3a
1 parent 20dc519
commit 9c69f3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
@@ -59,10 +59,6 @@ RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/libpcap-1.8.1.t
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
   && rm libpcap-1.8.1.tar.gz
 
-RUN go install github.com/ibmdb/go_ibm_db/installer@v0.4.5 \
-  && cd ${GOPATH}/pkg/mod/github.com/ibmdb/go_ibm_db\@v0.4.5/installer \
-  && go run setup.go
-
 ENV GOLANG_CROSSBUILD=1
 VOLUME      /app
 WORKDIR     /app

diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
@@ -27,7 +27,7 @@ RUN apt install -y --no-install-recommends --allow-unauthenticated\
   libxml2-dev \
   libsqlite3-dev
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
+# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4
 # See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y --no-install-recommends --allow-unauthenticated\
   libsystemd-dev{{- if eq .DEBIAN_VERSION "11" }}=247.3-7+deb11u4{{- end }}
@@ -77,6 +77,10 @@ RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/WpdPack_4_1_2.z
   --output-lib /libpcap/win/WpdPack/Lib/x64/libwpcap.a \
   --input-def /libpcap/win/WpdPack/wpcap.def
 
+RUN go install github.com/ibmdb/go_ibm_db/installer@v0.4.5 \
+  && cd ${GOPATH}/pkg/mod/github.com/ibmdb/go_ibm_db\@v0.4.5/installer \
+  && go run setup.go
+
 # Build-time metadata as defined at http://label-schema.org.
 ARG BUILD_DATE
 ARG IMAGE
@@ -86,4 +90,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.name=$IMAGE \
   org.label-schema.vcs-ref=$VCS_REF \
   org.label-schema.vcs-url=$VCS_URL \
-  org.label-schema.schema-version="1.0"
+  org.label-schema.schema-version="1.0"