From 0c73132db4e748845b547ecb8621c494895dd25f Mon Sep 17 00:00:00 2001 From: Eirik Martiniussen Sylliaas Date: Tue, 8 Sep 2020 21:35:39 +0200 Subject: [PATCH] Change CA file permissions in docker container --- Dockerfile | 2 +- Gopkg.lock | 93 ++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index b414db2..8a446b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/ca-certificates.crt +ADD --chown=1000:2000 https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/ca-certificates.crt COPY bin/feedy / ENTRYPOINT ["/feedy"] diff --git a/Gopkg.lock b/Gopkg.lock index d0b5d10..8ee0225 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,40 +2,51 @@ [[projects]] + digest = "1:573fa46f8d413d4bc3f7cc5e86b2c43cb21559f4fb0a19d9874d228e28fdc07c" name = "github.com/PuerkitoBio/goquery" packages = ["."] + pruneopts = "UT" revision = "2d2796f41742ece03e8086188fa4db16a3a0b458" version = "v1.5.0" [[projects]] + digest = "1:66b3310cf22cdc96c35ef84ede4f7b9b370971c4025f394c89a2638729653b11" name = "github.com/andybalholm/cascadia" packages = ["."] + pruneopts = "UT" revision = "901648c87902174f774fac311d7f176f8647bdaa" version = "v1.0.0" [[projects]] branch = "master" + digest = "1:72933bb0c875205176a29d964f94523cb40b482b2212bcd75a7844cbca5831e9" name = "github.com/eirsyl/flexit" packages = [ "app", "cmd", - "log" + "log", ] + pruneopts = "UT" revision = "77ccca0cd588b63834420d9ff5f48bad0626e903" [[projects]] + digest = "1:bbc4aacabe6880bdbce849c64cb061b7eddf39f132af4ea2853ddd32f85fbec3" name = "github.com/fatih/camelcase" packages = ["."] + pruneopts = "UT" revision = "44e46d280b43ec1531bb25252440e34f1b800b65" version = "v1.0.0" [[projects]] + digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" name = "github.com/fsnotify/fsnotify" packages = ["."] + pruneopts = "UT" revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" version = "v1.4.7" [[projects]] + digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10" name = "github.com/hashicorp/hcl" packages = [ ".", @@ -47,167 +58,213 @@ "hcl/token", "json/parser", "json/scanner", - "json/token" + "json/token", ] + pruneopts = "UT" revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241" version = "v1.0.0" [[projects]] + digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" name = "github.com/inconshreveable/mousetrap" packages = ["."] + pruneopts = "UT" revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" version = "v1.0" [[projects]] + digest = "1:4ef2c452afd1700966b7263f2e6bb8999ea636be18ce4d3960c02cd74b5da4b8" name = "github.com/jedib0t/go-pretty" packages = [ "table", - "text" + "text", ] + pruneopts = "UT" revision = "a37e1e030434d93557ca8a6a77b4cf9d31cc21ff" version = "v4.0.2" [[projects]] + digest = "1:31e761d97c76151dde79e9d28964a812c46efc5baee4085b86f68f0c654450de" name = "github.com/konsorten/go-windows-terminal-sequences" packages = ["."] + pruneopts = "UT" revision = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e" version = "v1.0.2" [[projects]] + digest = "1:bc1c0be40c67b6b4aee09d7508d5a2a52c1c116b1fa43806dad2b0d6b4d4003b" name = "github.com/lib/pq" packages = [ ".", "oid", - "scram" + "scram", ] + pruneopts = "UT" revision = "51e2106eed1cea199c802d2a49e91e2491b02056" version = "v1.1.0" [[projects]] + digest = "1:c568d7727aa262c32bdf8a3f7db83614f7af0ed661474b24588de635c20024c7" name = "github.com/magiconair/properties" packages = ["."] + pruneopts = "UT" revision = "c2353362d570a7bfa228149c62842019201cfb71" version = "v1.8.0" [[projects]] + digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318" name = "github.com/mitchellh/mapstructure" packages = ["."] + pruneopts = "UT" revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" version = "v1.1.2" [[projects]] + digest = "1:b0142f883994390cee3fc0efbee8644c91796eb17d6af1bf8268a0961e6c0f3b" name = "github.com/mmcdole/gofeed" packages = [ ".", "atom", "extensions", "internal/shared", - "rss" + "rss", ] + pruneopts = "UT" revision = "42010a154d249f5f753dfe03a6390b59671e403e" version = "v1.0.0-beta2" [[projects]] branch = "master" + digest = "1:fb880b85ddcd119242ca65175135771539226ab4f004ddf76b6b1220da231ea2" name = "github.com/mmcdole/goxpp" packages = ["."] + pruneopts = "UT" revision = "0068e33feabfc0086c7aeb58a9603f91c061c89f" [[projects]] + digest = "1:9ec6cf1df5ad1d55cf41a43b6b1e7e118a91bade4f68ff4303379343e40c0e25" name = "github.com/oklog/run" packages = ["."] + pruneopts = "UT" revision = "4dadeb3030eda0273a12382bb2348ffc7c9d1a39" version = "v1.0.0" [[projects]] + digest = "1:95741de3af260a92cc5c7f3f3061e85273f5a81b5db20d4bd68da74bd521675e" name = "github.com/pelletier/go-toml" packages = ["."] + pruneopts = "UT" revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" version = "v1.2.0" [[projects]] + digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "UT" revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" version = "v0.8.1" [[projects]] + digest = "1:87c2e02fb01c27060ccc5ba7c5a407cc91147726f8f40b70cceeedbc52b1f3a8" name = "github.com/sirupsen/logrus" packages = ["."] + pruneopts = "UT" revision = "e1e72e9de974bd926e5c56f83753fba2df402ce5" version = "v1.3.0" [[projects]] + digest = "1:3e39bafd6c2f4bf3c76c3bfd16a2e09e016510ad5db90dc02b88e2f565d6d595" name = "github.com/spf13/afero" packages = [ ".", - "mem" + "mem", ] + pruneopts = "UT" revision = "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5" version = "v1.2.1" [[projects]] + digest = "1:08d65904057412fc0270fc4812a1c90c594186819243160dc779a402d4b6d0bc" name = "github.com/spf13/cast" packages = ["."] + pruneopts = "UT" revision = "8c9545af88b134710ab1cd196795e7f2388358d7" version = "v1.3.0" [[projects]] + digest = "1:645cabccbb4fa8aab25a956cbcbdf6a6845ca736b2c64e197ca7cbb9d210b939" name = "github.com/spf13/cobra" packages = ["."] + pruneopts = "UT" revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" version = "v0.0.3" [[projects]] + digest = "1:68ea4e23713989dc20b1bded5d9da2c5f9be14ff9885beef481848edd18c26cb" name = "github.com/spf13/jwalterweatherman" packages = ["."] + pruneopts = "UT" revision = "4a4406e478ca629068e7768fc33f3f044173c0a6" version = "v1.0.0" [[projects]] + digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2" name = "github.com/spf13/pflag" packages = ["."] + pruneopts = "UT" revision = "298182f68c66c05229eb03ac171abe6e309ee79a" version = "v1.0.3" [[projects]] + digest = "1:de37e343c64582d7026bf8ab6ac5b22a72eac54f3a57020db31524affed9f423" name = "github.com/spf13/viper" packages = ["."] + pruneopts = "UT" revision = "6d33b5a963d922d182c91e8a1c88d81fd150cfd4" version = "v1.3.1" [[projects]] + digest = "1:5f7414cf41466d4b4dd7ec52b2cd3e481e08cfd11e7e24fef730c0e483e88bb1" name = "go.etcd.io/bbolt" packages = ["."] + pruneopts = "UT" revision = "63597a96ec0ad9e6d43c3fc81e809909e0237461" version = "v1.3.2" [[projects]] branch = "master" + digest = "1:058e9504b9a79bfe86092974d05bb3298d2aa0c312d266d43148de289a5065d9" name = "golang.org/x/crypto" packages = ["ssh/terminal"] + pruneopts = "UT" revision = "8dd112bcdc25174059e45e07517d9fc663123347" [[projects]] branch = "master" + digest = "1:03a8ff54c1a62710fe21a08ad9ccd554ac90232c4fd34c2731f65dd47e1f2077" name = "golang.org/x/net" packages = [ "html", "html/atom", - "html/charset" + "html/charset", ] + pruneopts = "UT" revision = "92fc7df08ae7536330f5a21328292abfa70520a8" [[projects]] branch = "master" + digest = "1:c65bd2920426dabbd19ea6a3e54ff8475fa930935ba58d23e8db49c142648279" name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] + pruneopts = "UT" revision = "a34e9553db1e492c9a76e60db2296ae7e5fbb772" [[projects]] + digest = "1:4392fcf42d5cf0e3ff78c96b2acf8223d49e4fdc53eb77c99d2f8dfe4680e006" name = "golang.org/x/text" packages = [ "encoding", @@ -229,20 +286,36 @@ "runes", "transform", "unicode/cldr", - "unicode/norm" + "unicode/norm", ] + pruneopts = "UT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" version = "v0.3.0" [[projects]] + digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" name = "gopkg.in/yaml.v2" packages = ["."] + pruneopts = "UT" revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" version = "v2.2.2" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "079f5b2dc725a475427ae2af67b694fbac7594aa413c71a3552ba0abbda5d3b2" + input-imports = [ + "github.com/eirsyl/flexit/app", + "github.com/eirsyl/flexit/cmd", + "github.com/eirsyl/flexit/log", + "github.com/jedib0t/go-pretty/table", + "github.com/jedib0t/go-pretty/text", + "github.com/lib/pq", + "github.com/mmcdole/gofeed", + "github.com/oklog/run", + "github.com/pkg/errors", + "github.com/spf13/cobra", + "github.com/spf13/viper", + "go.etcd.io/bbolt", + ] solver-name = "gps-cdcl" solver-version = 1