diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml index c5f4aed2..dc6058ac 100644 --- a/.github/workflows/deploy-website.yml +++ b/.github/workflows/deploy-website.yml @@ -40,7 +40,7 @@ jobs: wait-on: "http://127.0.0.1:9000" - name: "Deploy to Skynet" - uses: kwypchlo/deploy-to-skynet-action@main + uses: skynetlabs/deploy-to-skynet-action@v2 with: upload-dir: packages/website/public github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/changelog/items/other/mongo-replicaset-env.md b/changelog/items/other/mongo-replicaset-env.md new file mode 100644 index 00000000..0dcbb402 --- /dev/null +++ b/changelog/items/other/mongo-replicaset-env.md @@ -0,0 +1,2 @@ +- Parameterize MongoDB replicaset in `docker-compose.mongodb.yml` via + `SKYNET_DB_REPLICASET` from `.env` file. \ No newline at end of file diff --git a/docker-compose.mongodb.yml b/docker-compose.mongodb.yml index ebc085ab..41b07a86 100644 --- a/docker-compose.mongodb.yml +++ b/docker-compose.mongodb.yml @@ -9,7 +9,7 @@ x-logging: &default-logging services: mongo: image: mongo:4.4.1 - command: --keyFile=/data/mgkey --replSet=skynet + command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} container_name: mongo restart: unless-stopped logging: *default-logging diff --git a/docker/handshake/Dockerfile b/docker/handshake/Dockerfile index 1f068d97..4a3d8bd7 100644 --- a/docker/handshake/Dockerfile +++ b/docker/handshake/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.10.0-alpine +FROM node:16.11.1-alpine WORKDIR /opt/hsd diff --git a/packages/dashboard/Dockerfile b/packages/dashboard/Dockerfile index 8d93a036..8b2cfc32 100644 --- a/packages/dashboard/Dockerfile +++ b/packages/dashboard/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.10.0-alpine +FROM node:16.11.1-alpine WORKDIR /usr/app diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index e1b0016d..ed4adefd 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -10,8 +10,8 @@ "dependencies": { "@fontsource/metropolis": "4.5.0", "@ory/kratos-client": "0.5.4-alpha.1", - "@stripe/react-stripe-js": "1.5.0", - "@stripe/stripe-js": "1.19.1", + "@stripe/react-stripe-js": "1.6.0", + "@stripe/stripe-js": "1.20.2", "@tailwindcss/forms": "0.3.4", "autoprefixer": "10.3.7", "classnames": "2.3.1", @@ -31,11 +31,11 @@ "react-dom": "17.0.2", "react-toastify": "8.0.3", "skynet-js": "3.0.2", - "stripe": "8.181.0", + "stripe": "8.183.0", "superagent": "6.1.0", "swr": "1.0.1", "tailwindcss": "2.2.16", - "yup": "0.32.9" + "yup": "0.32.11" }, "resolutions": { "axios": "0.21.4" diff --git a/packages/dashboard/yarn.lock b/packages/dashboard/yarn.lock index 62b8da1c..329476e4 100644 --- a/packages/dashboard/yarn.lock +++ b/packages/dashboard/yarn.lock @@ -49,7 +49,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.15.4": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== @@ -181,17 +181,17 @@ dependencies: axios "^0.19.2" -"@stripe/react-stripe-js@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-1.5.0.tgz#7e4d80077e88e1f2c1f10ac255f2838d7c9488c2" - integrity sha512-A7+bNeb0O/kw3JdtMeiB6frokPcks5obi+TIjuFRXUMZ5o/o1Qe7eLgLnsb0KOO/g3KJqNCpHiYcKCLESZJJbQ== +"@stripe/react-stripe-js@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-1.6.0.tgz#e3adf6a6ea6d839193164fa3cfe73cf52db3a080" + integrity sha512-tMmsPD+wkpiiVJZgQ1E06tklG5MZHG462s6OWja9abpxq76kerAxMFN+KdhUg0LIEY79THbzvH3s/WGHasnV3w== dependencies: prop-types "^15.7.2" -"@stripe/stripe-js@1.19.1": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.19.1.tgz#51017bb1c6e12f0e74747534667e42e77b2c9978" - integrity sha512-gvaQ51FXHHKMypXMlSPZbpb7e5671oqySqEfU2MviAQCsikV/+vnvPPxOged4RvNwNM7v4ocsKadQwqIwPhgrQ== +"@stripe/stripe-js@1.20.2": + version "1.20.2" + resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.20.2.tgz#5bb8deff1ba6cdc83d0bfac58e4d61fe2e4a53e7" + integrity sha512-gTPpXQgAgKrAAvV2R5WO4NCuozALD4n3xaDLhPv+nAomIdPLtgEwI2xIGY7WMSKp9KfkKmlcjoPO4pkz8f/bpw== "@tailwindcss/forms@0.3.4": version "0.3.4" @@ -200,10 +200,10 @@ dependencies: mini-svg-data-uri "^1.2.3" -"@types/lodash@^4.14.165": - version "4.14.174" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.174.tgz#b4b06b6eced9850eed6b6a8f1abdd0f5192803c1" - integrity sha512-KMBLT6+g9qrGXpDt7ohjWPUD34WA/jasrtjTEHStF0NPdEwJ1N9SZ+4GaMVDeuk/y0+X5j9xFm6mNiXS7UoaLQ== +"@types/lodash@^4.14.175": + version "4.14.175" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45" + integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw== "@types/node@*", "@types/node@>=8.1.0": version "16.10.1" @@ -1757,7 +1757,7 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash-es@^4.17.15, lodash-es@^4.17.21: +lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -1812,7 +1812,7 @@ lodash.topath@^4.5.2: resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak= -lodash@^4.17.20, lodash@^4.17.21: +lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -2905,10 +2905,10 @@ strip-eof@^1.0.0: resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= -stripe@8.181.0: - version "8.181.0" - resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.181.0.tgz#e49514b10c54d146cc5306204410658c2d689386" - integrity sha512-yEKT+/a/5OMYqGPhI/4jy/kiKHKeew1n9BvNtHbOA9lQDM8yVIYDx0nbQMj5rMowivAMqY67mejDJeSBlcPASA== +stripe@8.183.0: + version "8.183.0" + resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.183.0.tgz#3dc183fafff618526a576a0d9972483b08075e06" + integrity sha512-QcM3nimH1CuP49VPPRt36Wgfu4QoS+Wm0eyGMis7Ej+seWFKqMffMdx7TE2gn8dVsJIOA1kDuIbAQGqpZHozGA== dependencies: "@types/node" ">=8.1.0" qs "^6.6.0" @@ -3269,15 +3269,15 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -yup@0.32.9: - version "0.32.9" - resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.9.tgz#9367bec6b1b0e39211ecbca598702e106019d872" - integrity sha512-Ci1qN+i2H0XpY7syDQ0k5zKQ/DoxO0LzPg8PAR/X4Mpj6DqaeCoIYEEjDJwhArh3Fa7GWbQQVDZKeXYlSH4JMg== +yup@0.32.11: + version "0.32.11" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5" + integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg== dependencies: - "@babel/runtime" "^7.10.5" - "@types/lodash" "^4.14.165" - lodash "^4.17.20" - lodash-es "^4.17.15" + "@babel/runtime" "^7.15.4" + "@types/lodash" "^4.14.175" + lodash "^4.17.21" + lodash-es "^4.17.21" nanoclone "^0.2.1" property-expr "^2.0.4" toposort "^2.0.2" diff --git a/packages/dnslink-api/Dockerfile b/packages/dnslink-api/Dockerfile index b908680c..903c6757 100644 --- a/packages/dnslink-api/Dockerfile +++ b/packages/dnslink-api/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.10.0-alpine +FROM node:16.11.1-alpine WORKDIR /usr/app diff --git a/packages/handshake-api/Dockerfile b/packages/handshake-api/Dockerfile index 6af633bd..2ed56e43 100644 --- a/packages/handshake-api/Dockerfile +++ b/packages/handshake-api/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.10.0-alpine +FROM node:16.11.1-alpine WORKDIR /usr/app diff --git a/packages/health-check/Dockerfile b/packages/health-check/Dockerfile index 524885d1..dbf0a774 100644 --- a/packages/health-check/Dockerfile +++ b/packages/health-check/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.10.0-alpine +FROM node:16.11.1-alpine RUN apk update && apk add dnsmasq diff --git a/packages/website/Dockerfile b/packages/website/Dockerfile index 057b5430..d67627e1 100644 --- a/packages/website/Dockerfile +++ b/packages/website/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.10.0-alpine +FROM node:16.11.1-alpine RUN apk update && apk add autoconf automake build-base libtool nasm pkgconfig diff --git a/packages/website/package.json b/packages/website/package.json index 801e6fa6..d147dadd 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -15,7 +15,7 @@ "copy-text-to-clipboard": "^3.0.1", "crypto-browserify": "^3.12.0", "framer-motion": "^4.1.17", - "gatsby": "^3.14.2", + "gatsby": "^3.14.3", "gatsby-background-image": "^1.5.3", "gatsby-image": "^3.11.0", "gatsby-plugin-image": "^1.14.1", @@ -43,7 +43,7 @@ "http-status-codes": "^2.1.4", "jsonp": "^0.2.1", "ms": "^2.1.2", - "nanoid": "^3.1.29", + "nanoid": "^3.1.30", "normalize.css": "^8.0.1", "path-browserify": "^1.0.1", "polished": "^4.1.3", @@ -62,7 +62,7 @@ "skynet-js": "^4.0.11-beta", "stream-browserify": "^3.0.0", "swr": "^1.0.1", - "tailwindcss": "^2.2.16" + "tailwindcss": "^2.2.17" }, "devDependencies": { "cross-env": "^7.0.3", diff --git a/packages/website/yarn.lock b/packages/website/yarn.lock index 389385b7..f5f36f91 100644 --- a/packages/website/yarn.lock +++ b/packages/website/yarn.lock @@ -5961,10 +5961,10 @@ gatsby-background-image@^1.5.3: short-uuid "^4.1.0" sort-media-queries "^0.2.2" -gatsby-cli@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-3.14.1.tgz#508515760d708b36cd8491f30f062cc451dd2252" - integrity sha512-0k8fJU2oE35U1D3sj4qFHMmKj32LJRmXeUSsDtJWdvNZ8+xhBNyIh+YGcqfqbCNicLXiPyfzvt6UwBIbOOTCRQ== +gatsby-cli@^3.14.2: + version "3.14.2" + resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-3.14.2.tgz#1d4ebeb199c3a910d80abc13f458888c8cd7f2f8" + integrity sha512-p3E6XyzwVPGpHd0AYVkvnPkZoEElWLWjAG10173k5aGtpoM6dIuJuSlgBPrjeev9PQ7y3oCoCO3zBjnGdB1/WQ== dependencies: "@babel/code-frame" "^7.14.0" "@babel/runtime" "^7.15.4" @@ -6464,10 +6464,10 @@ gatsby-worker@^0.5.0: "@babel/core" "^7.15.5" "@babel/runtime" "^7.15.4" -gatsby@^3.14.2: - version "3.14.2" - resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-3.14.2.tgz#684a49ed9521abe5e72ff36b1fc3a4ed96fee0fb" - integrity sha512-1cjyfGkQ9zXtou+RhtYBprv8nYXTPuRIs4IFzBP373vBD1CdwabAC/R8kjqHfdvyNrorzg3sqRjLjActtfU8NA== +gatsby@^3.14.3: + version "3.14.3" + resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-3.14.3.tgz#62bc020d0997f4b30e419abe644f60483f99e8b5" + integrity sha512-B6NmmIvGGVNktky0YGugxMJlZAbKEzGMMBA8ojbaDhfEzfNXxsyHYd0aHKL0fNwPEqMKUsllaACdXrw6CWRk2g== dependencies: "@babel/code-frame" "^7.14.0" "@babel/core" "^7.15.5" @@ -6536,7 +6536,7 @@ gatsby@^3.14.2: find-cache-dir "^3.3.1" fs-exists-cached "1.0.0" fs-extra "^10.0.0" - gatsby-cli "^3.14.1" + gatsby-cli "^3.14.2" gatsby-core-utils "^2.14.0" gatsby-graphiql-explorer "^1.14.0" gatsby-legacy-polyfills "^1.14.0" @@ -6575,7 +6575,6 @@ gatsby@^3.14.2: opentracing "^0.14.4" p-defer "^3.0.0" parseurl "^1.3.3" - path-to-regexp "0.1.7" physical-cpu-count "^2.0.0" platform "^1.3.6" postcss "^8.3.5" @@ -9406,10 +9405,10 @@ nanocolors@^0.2.2: resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.2.10.tgz#a712df4d3c1bf12d9b4fb8b5aa61b5ba31337503" integrity sha512-i+EDWGsJClQwR/bhLIG/CObZZwaYaS5qt+yjxZbfV+77QiNHNzE9nj4d9Ut1TGZ0R0eSwPcQWzReASzXuw/7oA== -nanoid@^3.1.28, nanoid@^3.1.29: - version "3.1.29" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.29.tgz#214fb2d7a33e1a5bef4757b779dfaeb6a4e5aeb4" - integrity sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg== +nanoid@^3.1.28, nanoid@^3.1.30: + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== nanomatch@^1.2.9: version "1.2.13" @@ -12739,10 +12738,10 @@ table@^6.0.9: string-width "^4.2.0" strip-ansi "^6.0.0" -tailwindcss@^2.2.16: - version "2.2.16" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.16.tgz#32f81bdf1758b639cb83b9d30bf7cbecdda49e5e" - integrity sha512-EireCtpQyyJ4Xz8NYzHafBoy4baCOO96flM0+HgtsFcIQ9KFy/YBK3GEtlnD+rXen0e4xm8t3WiUcKBJmN6yjg== +tailwindcss@^2.2.17: + version "2.2.17" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.17.tgz#c6332731f9ff1b6628ff589c95c38685347775e3" + integrity sha512-WgRpn+Pxn7eWqlruxnxEbL9ByVRWi3iC10z4b6dW0zSdnkPVC4hPMSWLQkkW8GCyBIv/vbJ0bxIi9dVrl4CfoA== dependencies: arg "^5.0.1" bytes "^3.0.0"