Skip to content

Commit 9c69f3a

Browse files
committed
fix: move the install to the main Docker image
1 parent 20dc519 commit 9c69f3a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

go/base/Dockerfile.tmpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/libpcap-1.8.1.t
5959
&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
6060
&& rm libpcap-1.8.1.tar.gz
6161

62-
RUN go install github.com/ibmdb/go_ibm_db/[email protected] \
63-
&& cd ${GOPATH}/pkg/mod/github.com/ibmdb/go_ibm_db\@v0.4.5/installer \
64-
&& go run setup.go
65-
6662
ENV GOLANG_CROSSBUILD=1
6763
VOLUME /app
6864
WORKDIR /app

go/main/Dockerfile.tmpl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN apt install -y --no-install-recommends --allow-unauthenticated\
2727
libxml2-dev \
2828
libsqlite3-dev
2929

30-
# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4
30+
# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4
3131
# See https://github.com/elastic/golang-crossbuild/pull/316
3232
RUN apt install -y --no-install-recommends --allow-unauthenticated\
3333
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
7777
--output-lib /libpcap/win/WpdPack/Lib/x64/libwpcap.a \
7878
--input-def /libpcap/win/WpdPack/wpcap.def
7979

80+
RUN go install github.com/ibmdb/go_ibm_db/[email protected] \
81+
&& cd ${GOPATH}/pkg/mod/github.com/ibmdb/go_ibm_db\@v0.4.5/installer \
82+
&& go run setup.go
83+
8084
# Build-time metadata as defined at http://label-schema.org.
8185
ARG BUILD_DATE
8286
ARG IMAGE
@@ -86,4 +90,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
8690
org.label-schema.name=$IMAGE \
8791
org.label-schema.vcs-ref=$VCS_REF \
8892
org.label-schema.vcs-url=$VCS_URL \
89-
org.label-schema.schema-version="1.0"
93+
org.label-schema.schema-version="1.0"

0 commit comments

Comments
 (0)