Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add DB2 CLI libraries #385

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: add DB2 CLI libraries #385

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
925ac9f
feat: add DB2 CLI libraries
kuisathaverat Jan 25, 2024
20dc519
Apply suggestions from code review
kuisathaverat Jan 25, 2024
9c69f3a
fix: move the install to the main Docker image
kuisathaverat Jan 26, 2024
1a824ce
Merge branch 'main' into feat/db2
kuisathaverat Jan 26, 2024
1fce68f
Apply suggestions from code review
kuisathaverat Jan 26, 2024
c849ea2
Merge branch 'main' into feat/db2
kuisathaverat Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion go/base/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +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


ENV GOLANG_CROSSBUILD=1
VOLUME /app
WORKDIR /app
Expand Down
8 changes: 6 additions & 2 deletions go/main/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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/[email protected] \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • As the driver library version is hardcoded here. Is there a way we could remove the dependency and use the latest version?
  • I don't think it would be possible as we run the setup script below by locating the installation folder. Just to check if its possible.

&& cd ${GOPATH}/pkg/mod/github.com/ibmdb/go_ibm_db\@v0.4.5/installer \
&& go run setup.go
kuisathaverat marked this conversation as resolved.
Show resolved Hide resolved

# Build-time metadata as defined at http://label-schema.org.
ARG BUILD_DATE
ARG IMAGE
Expand All @@ -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"