From 756461b2cd5f217087b2e58dab93b85632144f12 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Fri, 10 Feb 2023 11:26:27 -0600 Subject: [PATCH 1/4] upgrade Oracle Instant Client to 19.8 --- Dockerfile | 8 ++++---- scripts/linux_amd64/oci8.pc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a64ee8..41bead5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN yum update -y && yum install -y \ zip \ git -ENV GOLANG_VERSION 1.17.7 +ENV GOLANG_VERSION 1.19.1 RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \ @@ -34,8 +34,8 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH ENV PKG_CONFIG_PATH $GOPATH/src/github.com/hashicorp/vault-plugin-database-oracle/scripts/linux_amd64 RUN yum install -y \ - oracle-instantclient19.6-basic \ - oracle-instantclient19.6-devel + oracle-instantclient19.8-basic \ + oracle-instantclient19.8-devel RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" "$GOPATH/src/github.com/hashicorp/vault-plugin-database-oracle" && chmod -R 777 "$GOPATH" @@ -55,4 +55,4 @@ CMD echo "Please specify a command, e.g. 'make bin' or 'make test-ci'" # Set default target to 'cross-image'. # # =================================== -FROM cross-image \ No newline at end of file +FROM cross-image diff --git a/scripts/linux_amd64/oci8.pc b/scripts/linux_amd64/oci8.pc index 4764315..d165f3a 100644 --- a/scripts/linux_amd64/oci8.pc +++ b/scripts/linux_amd64/oci8.pc @@ -1,8 +1,8 @@ -libdir=/usr/lib/oracle/19.6/client64/lib -includedir=/usr/include/oracle/19.6/client64 +libdir=/usr/lib/oracle/19.8/client64/lib +includedir=/usr/include/oracle/19.8/client64 Name: oci8 Description: oci8 library Libs: -L${libdir} -lclntsh Cflags: -I${includedir} -Version: 19.6 +Version: 19.8 From dd9d2a50b458e280795d81e9a7c816a27c7f7067 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Fri, 10 Feb 2023 11:56:19 -0600 Subject: [PATCH 2/4] upgrade Oracle Instant Client to 19.18 --- Dockerfile | 4 ++-- README.md | 18 +++++++++++++++--- scripts/linux_amd64/oci8.pc | 6 +++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 41bead5..9607adc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,8 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH ENV PKG_CONFIG_PATH $GOPATH/src/github.com/hashicorp/vault-plugin-database-oracle/scripts/linux_amd64 RUN yum install -y \ - oracle-instantclient19.8-basic \ - oracle-instantclient19.8-devel + oracle-instantclient19.18-basic \ + oracle-instantclient19.18-devel RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" "$GOPATH/src/github.com/hashicorp/vault-plugin-database-oracle" && chmod -R 777 "$GOPATH" diff --git a/README.md b/README.md index e3f9d7d..17c4ec0 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,23 @@ This project uses the database plugin interface introduced in Vault version 0.7. This plugin is not compatible with Alpine Linux out of the box. Oracle's libraries are glibc dependant, and Alpine has musl as its default C library. -## Build +## Releases + +For linux/amd64, pre-built binaries can be found at +[the releases page](https://releases.hashicorp.com/vault-plugin-database-oracle/). +See the following table to determine what version of the Instant Client SDK the +plugin was built with: + +|Plugin Release|Instance Client Version| +|---|---| +|v0.8.0|19.18| +|v0.7.0|19.6| -For linux/amd64, pre-built binaries can be found at [the releases page](https://releases.hashicorp.com/vault-plugin-database-oracle/) (built with Oracle Instant Client SDK 19.3) -For other platforms, there are not currently pre-built binaries available. +## Build + +For platforms other than linux/amd64, there are not currently pre-built +binaries available. Before building, you will need to download the Oracle Instant Client library, which is available from [Oracle](http://www.oracle.com/technetwork/database/features/instant-client/index-097480.html). Download the SDK package to get the headers and diff --git a/scripts/linux_amd64/oci8.pc b/scripts/linux_amd64/oci8.pc index d165f3a..cd58d4a 100644 --- a/scripts/linux_amd64/oci8.pc +++ b/scripts/linux_amd64/oci8.pc @@ -1,8 +1,8 @@ -libdir=/usr/lib/oracle/19.8/client64/lib -includedir=/usr/include/oracle/19.8/client64 +libdir=/usr/lib/oracle/19.18/client64/lib +includedir=/usr/include/oracle/19.18/client64 Name: oci8 Description: oci8 library Libs: -L${libdir} -lclntsh Cflags: -I${includedir} -Version: 19.8 +Version: 19.18 From a7d00862473311d65ffa411cc272b7a2dcc3cd77 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Fri, 10 Feb 2023 12:01:16 -0600 Subject: [PATCH 3/4] update release table in readme --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 17c4ec0..abaa95a 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,19 @@ This plugin is not compatible with Alpine Linux out of the box. Oracle's librari For linux/amd64, pre-built binaries can be found at [the releases page](https://releases.hashicorp.com/vault-plugin-database-oracle/). -See the following table to determine what version of the Instant Client SDK the -plugin was built with: +See the following table to determine what version of the Oracle Instant Client +SDK the plugin was built with: |Plugin Release|Instance Client Version| |---|---| |v0.8.0|19.18| -|v0.7.0|19.6| +|v0.7.0|19.6 | +|v0.6.1|19.6 | +|v0.6.0|19.6 | +|v0.5.0|19.6 | +|v0.4.0|19.6 | +|v0.3.0|19.6 | +|v0.2.0|19.3 | ## Build From 617cc4a3dc72764417451c036ce030aacabff385 Mon Sep 17 00:00:00 2001 From: John-Michael Faircloth Date: Mon, 13 Feb 2023 10:27:57 -0600 Subject: [PATCH 4/4] Update Dockerfile Co-authored-by: Christopher Swenson --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9607adc..b385bb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN yum update -y && yum install -y \ zip \ git -ENV GOLANG_VERSION 1.19.1 +ENV GOLANG_VERSION 1.19.5 RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \