From 9d680db4620f0313cc12c1a2a53e09d016c5dd03 Mon Sep 17 00:00:00 2001 From: RJ Seibert Date: Sun, 24 Sep 2017 01:21:15 -0400 Subject: [PATCH 1/5] Use an enviroENV for db host --- .project | 11 +++++++++++ Dockerfile | 4 ++++ config.yaml.sample | 2 +- database/pgsql/pgsql.go | 8 +++++++- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 00000000..48d12ad4 --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + clair + + + + + + + + diff --git a/Dockerfile b/Dockerfile index 151c3deb..a79a462e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,12 +14,16 @@ FROM golang:1.8-alpine +ENV POSTGRESQL_SERVICE_HOST localhost + VOLUME /config EXPOSE 6060 6061 ADD . /go/src/github.com/coreos/clair/ WORKDIR /go/src/github.com/coreos/clair/ +COPY /config.yaml /etc/clair/config.yaml + RUN apk add --no-cache git bzr rpm xz && \ go install -v github.com/coreos/clair/cmd/clair && \ mv /go/bin/clair /clair && \ diff --git a/config.yaml.sample b/config.yaml.sample index 23e85fed..4bf48580 100644 --- a/config.yaml.sample +++ b/config.yaml.sample @@ -20,7 +20,7 @@ clair: options: # PostgreSQL Connection string # https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING - source: host=localhost port=5432 user=postgres sslmode=disable statement_timeout=60000 + source: host=$POSTGRESQL_SERVICE_HOST port=5432 user=postgres sslmode=disable statement_timeout=60000 # Number of elements kept in the cache # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database. diff --git a/database/pgsql/pgsql.go b/database/pgsql/pgsql.go index 335b77c7..1d8a8785 100644 --- a/database/pgsql/pgsql.go +++ b/database/pgsql/pgsql.go @@ -22,6 +22,7 @@ import ( "net/url" "strings" "time" + "os" "gopkg.in/yaml.v2" @@ -202,7 +203,12 @@ func openDatabase(registrableComponentConfig database.RegistrableComponentConfig } // Open database. - pg.DB, err = sql.Open("postgres", pg.config.Source) + host := os.Getenv("POSTGRESQL_SERVICE_HOST") + + modifiedSource := strings.Replace(pg.config.Source, "$POSTGRESQL_SERVICE_HOST", host, -1) + fmt.Println("postgresql hostname replaced: ", modifiedSource) + + pg.DB, err = sql.Open("postgres", modifiedSource) if err != nil { pg.Close() return nil, fmt.Errorf("pgsql: could not open database: %v", err) From 06cffd08259045f66f787faad1764f374b5976e4 Mon Sep 17 00:00:00 2001 From: RJ Seibert Date: Sun, 24 Sep 2017 01:24:55 -0400 Subject: [PATCH 2/5] .gitignore the .project --- .DS_Store | Bin 0 -> 8196 bytes .gitignore | 2 ++ .project | 11 ----------- 3 files changed, 2 insertions(+), 11 deletions(-) create mode 100644 .DS_Store create mode 100644 .gitignore delete mode 100644 .project diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..907c8a35434e18cbd03106c7a96fff133702f8f7 GIT binary patch literal 8196 zcmeHMTWB3c82-Op+C6sLY|_RgYr{EBFex^)DYVj5OiylYdZVF9noFzkD1pCn-{u>Vs(eB=rV@B0eY)ZNR5K2^ODx5xo2}yD7Q)Sc;v2nQv$Q z|DVfuzMWzA5D_}3tldPlM5J*RXl&qOl_cyUuSg|vODQ8bp4_0=H}3l5L?stjc&i4* zfMP%~pcqgLC>%GHH*7y3I z^Y)lg5uEj>4|BDzU>6;GdMN9=QjV~Zg$Gegm#DP3TJMs2(ks=b^H9l2_4@X z84m54aG|3mrs2`RFN9sPvoXV%3ha|M_vIArZtju0suH7}$ct`*Q+6R>Y)rRCD@($X{;u&u$=2LfKIk%=9fnst5P zoa0$W5O=zxMK=fC%((3uRw4>(-L0EL#b^!2(YSH%7Tp}q`jeA9=^$=v+i#kWieZms zg78G%_IOHPi?Q1eq&s*@YprWU#B^Aen5fpcpn}Hq_Lwe1Y`^u?MEiK7AD{{H>1ld_ z-l8jXjXtGs=m+|RZqQBogZ`wy=x_Q58mdu)TGXKdJFyF`XhS>F=s+iqq7Nt0j{!V_ zENo05hdgF*9#7&aJc}3c5?;oecn_EHK0d%ze1fm=9e%>kxQ=<;z;C!2O|2x}@9FTu ztRuwljEjYvk3T$JSY5cuL%oNp^{zW!xYsvDa;?6%M(Ve%z4Mj`mi_XJ^(RFasY<4NVG71UEHvwS-@V$hxB?sT-wI z@WRSkP8#J>+M>GmL0vb>r1(X3|3hqDCp9jr2kO~M{9=eoS2K46EwP$F|5Kjd(>(nu zqzOVfHlhkiY-dsKVL={5FU#>5j^h-DF^bbT!-CAg!Q(iG5Ji^d6D-VUSeDP>d0fCN zconbVb-aO#cpI1S4&KFw_y`~43a;TZe2y>hCBDVnGJzghCeR-j3$)l@@Lb=^aod8R zm%6K(V&HZ&AkKbHwc`HYv-bCY>7)w9fMVeP$pFf_`@1`NZEGD(;;x - - clair - - - - - - - - From ec1fe8c751b78c68b42d4ef007b8df938690ee2d Mon Sep 17 00:00:00 2001 From: RJ Seibert Date: Sun, 24 Sep 2017 01:31:33 -0400 Subject: [PATCH 3/5] Maybe no .gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1db27846..00000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#Eclipse -.project From 58c026209134c14436141cf04f23866da4d6e71f Mon Sep 17 00:00:00 2001 From: RJ Seibert Date: Sun, 24 Sep 2017 01:33:32 -0400 Subject: [PATCH 4/5] .gitignore --- .DS_Store | Bin 8196 -> 0 bytes .gitignore | 5 +++++ .project | 11 +++++++++++ 3 files changed, 16 insertions(+) delete mode 100644 .DS_Store create mode 100644 .gitignore create mode 100644 .project diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 907c8a35434e18cbd03106c7a96fff133702f8f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMTWB3c82-Op+C6sLY|_RgYr{EBFex^)DYVj5OiylYdZVF9noFzkD1pCn-{u>Vs(eB=rV@B0eY)ZNR5K2^ODx5xo2}yD7Q)Sc;v2nQv$Q z|DVfuzMWzA5D_}3tldPlM5J*RXl&qOl_cyUuSg|vODQ8bp4_0=H}3l5L?stjc&i4* zfMP%~pcqgLC>%GHH*7y3I z^Y)lg5uEj>4|BDzU>6;GdMN9=QjV~Zg$Gegm#DP3TJMs2(ks=b^H9l2_4@X z84m54aG|3mrs2`RFN9sPvoXV%3ha|M_vIArZtju0suH7}$ct`*Q+6R>Y)rRCD@($X{;u&u$=2LfKIk%=9fnst5P zoa0$W5O=zxMK=fC%((3uRw4>(-L0EL#b^!2(YSH%7Tp}q`jeA9=^$=v+i#kWieZms zg78G%_IOHPi?Q1eq&s*@YprWU#B^Aen5fpcpn}Hq_Lwe1Y`^u?MEiK7AD{{H>1ld_ z-l8jXjXtGs=m+|RZqQBogZ`wy=x_Q58mdu)TGXKdJFyF`XhS>F=s+iqq7Nt0j{!V_ zENo05hdgF*9#7&aJc}3c5?;oecn_EHK0d%ze1fm=9e%>kxQ=<;z;C!2O|2x}@9FTu ztRuwljEjYvk3T$JSY5cuL%oNp^{zW!xYsvDa;?6%M(Ve%z4Mj`mi_XJ^(RFasY<4NVG71UEHvwS-@V$hxB?sT-wI z@WRSkP8#J>+M>GmL0vb>r1(X3|3hqDCp9jr2kO~M{9=eoS2K46EwP$F|5Kjd(>(nu zqzOVfHlhkiY-dsKVL={5FU#>5j^h-DF^bbT!-CAg!Q(iG5Ji^d6D-VUSeDP>d0fCN zconbVb-aO#cpI1S4&KFw_y`~43a;TZe2y>hCBDVnGJzghCeR-j3$)l@@Lb=^aod8R zm%6K(V&HZ&AkKbHwc`HYv-bCY>7)w9fMVeP$pFf_`@1`NZEGD(;;x + + clair + + + + + + + + From 3629f8ee33a39df9912b842f5ab42fd4241180e0 Mon Sep 17 00:00:00 2001 From: RJ Seibert Date: Sun, 24 Sep 2017 01:34:02 -0400 Subject: [PATCH 5/5] Remove .project --- .project | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 48d12ad4..00000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - clair - - - - - - - -