diff --git a/docker-images/prometheus/Dockerfile b/docker-images/prometheus/Dockerfile index 8509d64ab694..6b1667da8483 100644 --- a/docker-images/prometheus/Dockerfile +++ b/docker-images/prometheus/Dockerfile @@ -19,7 +19,7 @@ RUN ls '/generated/prometheus' # Prepare final image # hadolint ignore=DL3007 -FROM quay.io/prometheus/busybox-linux-amd64:latest +FROM quay.io/prometheus/busybox-linux-amd64:latest@sha256:95b4653eb9e9e9810bec7f55b428cefd04c02fe578fbb83cb7372611d525abeb # Should reflect versions above LABEL com.sourcegraph.prometheus.version=v2.38.0 diff --git a/internal/cmd/git-combine/Dockerfile b/internal/cmd/git-combine/Dockerfile index 2123ce2e27e4..f86a93e2642d 100644 --- a/internal/cmd/git-combine/Dockerfile +++ b/internal/cmd/git-combine/Dockerfile @@ -22,7 +22,7 @@ RUN go build . # Does not need to use sourcegraph-alpine since this is only deployed for # Sourcegraph.com. # alpine_base CHECK:ALPINE_OK -FROM alpine:3.15 as alpine_base +FROM alpine:3.15@sha256:19b4bcc4f60e99dd5ebdca0cbce22c503bbcff197549d7e19dab4f22254dc864 as alpine_base RUN apk add --no-cache\ bash \ diff --git a/package.json b/package.json index f36a8c5aa2d7..2c5203f44960 100644 --- a/package.json +++ b/package.json @@ -176,7 +176,7 @@ "@types/d3-selection": "1.4.1", "@types/d3-shape": "1.3.2", "@types/d3-time-format": "3.0.0", - "@types/escape-html": "^1.0.1", + "@types/escape-html": "1.0.1", "@types/expect": "24.3.0", "@types/express": "4.17.11", "@types/fancy-log": "1.3.1", @@ -186,34 +186,34 @@ "@types/highlight.js": "9.12.4", "@types/is-absolute-url": "3.0.0", "@types/jest": "27.4.0", - "@types/js-base64": "^3.3.1", + "@types/js-base64": "3.3.1", "@types/js-cookie": "2.2.6", "@types/js-yaml": "4.0.3", "@types/jsdom": "12.2.4", "@types/lodash": "4.14.167", - "@types/lru-cache": "^7.6.1", + "@types/lru-cache": "7.6.1", "@types/marked": "4.0.3", "@types/mime-types": "2.1.0", "@types/mini-css-extract-plugin": "2.0.1", "@types/mocha": "8.2.0", - "@types/mock-require": "^2.0.1", + "@types/mock-require": "2.0.1", "@types/mockdate": "2.0.0", "@types/mz": "2.7.3", "@types/node": "13.13.5", "@types/node-fetch": "2.5.10", "@types/pollyjs__core": "4.3.1", "@types/pollyjs__persister-fs": "2.0.1", - "@types/puppeteer": "^5.4.5", + "@types/puppeteer": "5.4.5", "@types/react": "18.0.8", - "@types/react-calendar": "^3.5.2", + "@types/react-calendar": "3.5.2", "@types/react-circular-progressbar": "1.0.2", "@types/react-dom": "18.0.2", "@types/react-grid-layout": "1.3.0", - "@types/react-router": "^5.1.18", - "@types/react-router-dom": "^5.3.3", + "@types/react-router": "5.1.18", + "@types/react-router-dom": "5.3.3", "@types/recharts": "1.8.23", "@types/resize-observer-browser": "0.1.4", - "@types/rimraf": "^3.0.2", + "@types/rimraf": "3.0.2", "@types/sanitize-html": "2.3.0", "@types/sass": "1.16.1", "@types/semver": "7.3.1", @@ -221,7 +221,7 @@ "@types/signale": "1.4.1", "@types/simmerjs": "0.5.1", "@types/sinon": "9.0.4", - "@types/socket.io": "^3.0.2", + "@types/socket.io": "3.0.2", "@types/socket.io-client": "1.4.33", "@types/speed-measure-webpack-plugin": "1.3.4", "@types/svgo": "2.6.0", @@ -229,12 +229,12 @@ "@types/testing-library__jest-dom": "5.9.5", "@types/textarea-caret": "3.0.0", "@types/uuid": "8.0.1", - "@types/vscode": "^1.63.1", + "@types/vscode": "1.63.1", "@types/webpack-bundle-analyzer": "4.4.1", "@types/webpack-dev-server": "4.0.3", "@types/webpack-manifest-plugin": "3.0.5", - "@types/webpack-stats-plugin": "^0.3.2", - "@types/yauzl": "^2.9.2", + "@types/webpack-stats-plugin": "0.3.2", + "@types/yauzl": "2.10.0", "@vscode/test-electron": "^2.1.3", "abort-controller": "^3.0.0", "autoprefixer": "^10.2.1", @@ -391,7 +391,7 @@ "@sourcegraph/extension-api-classes": "^1.1.0", "@storybook/addon-controls": "^6.5.9", "@storybook/addon-knobs": "^6.4.0", - "@types/react-resizable": "^3.0.2", + "@types/react-resizable": "3.0.2", "@visx/annotation": "^2.10.0", "@visx/axis": "^2.11.1", "@visx/glyph": "^2.10.0", diff --git a/yarn.lock b/yarn.lock index 3b8bb5ad9342..19571abe4f39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8239,7 +8239,7 @@ __metadata: languageName: node linkType: hard -"@types/escape-html@npm:^1.0.1": +"@types/escape-html@npm:1.0.1": version: 1.0.1 resolution: "@types/escape-html@npm:1.0.1" checksum: 141d6e44dd514b0bf8a1c5e7730d6b9fa291bb11a52bcc3434d269252b10622f52bd7458553efc2c95ca8341bafab836fe696f8fe72f82c5809204239b8ba791 @@ -8548,7 +8548,7 @@ __metadata: languageName: node linkType: hard -"@types/js-base64@npm:^3.3.1": +"@types/js-base64@npm:3.3.1": version: 3.3.1 resolution: "@types/js-base64@npm:3.3.1" dependencies: @@ -8642,6 +8642,13 @@ __metadata: languageName: node linkType: hard +"@types/lru-cache@npm:7.6.1": + version: 7.6.1 + resolution: "@types/lru-cache@npm:7.6.1" + checksum: 8915c0762f4f31e660d4145707f2418c96f8a80e8543fd312c9a7af4c11cdab314f9df9f6168dbe203e81fb6881757f72b5eeacddefe87d028e6c3d55c8bc987 + languageName: node + linkType: hard + "@types/lru-cache@npm:^5.1.0": version: 5.1.1 resolution: "@types/lru-cache@npm:5.1.1" @@ -8649,13 +8656,6 @@ __metadata: languageName: node linkType: hard -"@types/lru-cache@npm:^7.6.1": - version: 7.6.1 - resolution: "@types/lru-cache@npm:7.6.1" - checksum: 8915c0762f4f31e660d4145707f2418c96f8a80e8543fd312c9a7af4c11cdab314f9df9f6168dbe203e81fb6881757f72b5eeacddefe87d028e6c3d55c8bc987 - languageName: node - linkType: hard - "@types/marked@npm:4.0.3": version: 4.0.3 resolution: "@types/marked@npm:4.0.3" @@ -8718,7 +8718,7 @@ __metadata: languageName: node linkType: hard -"@types/mock-require@npm:^2.0.1": +"@types/mock-require@npm:2.0.1": version: 2.0.1 resolution: "@types/mock-require@npm:2.0.1" dependencies: @@ -8874,7 +8874,7 @@ __metadata: languageName: node linkType: hard -"@types/puppeteer@npm:^5.4.5": +"@types/puppeteer@npm:5.4.5": version: 5.4.5 resolution: "@types/puppeteer@npm:5.4.5" dependencies: @@ -8904,7 +8904,7 @@ __metadata: languageName: node linkType: hard -"@types/react-calendar@npm:^3.5.2": +"@types/react-calendar@npm:3.5.2": version: 3.5.2 resolution: "@types/react-calendar@npm:3.5.2" dependencies: @@ -8940,7 +8940,7 @@ __metadata: languageName: node linkType: hard -"@types/react-resizable@npm:^3.0.2": +"@types/react-resizable@npm:3.0.2": version: 3.0.2 resolution: "@types/react-resizable@npm:3.0.2" dependencies: @@ -8949,7 +8949,7 @@ __metadata: languageName: node linkType: hard -"@types/react-router-dom@npm:^5.3.3": +"@types/react-router-dom@npm:5.3.3": version: 5.3.3 resolution: "@types/react-router-dom@npm:5.3.3" dependencies: @@ -8960,7 +8960,7 @@ __metadata: languageName: node linkType: hard -"@types/react-router@npm:*, @types/react-router@npm:^5.1.18": +"@types/react-router@npm:*, @types/react-router@npm:5.1.18": version: 5.1.18 resolution: "@types/react-router@npm:5.1.18" dependencies: @@ -9043,7 +9043,7 @@ __metadata: languageName: node linkType: hard -"@types/rimraf@npm:^3.0.2": +"@types/rimraf@npm:3.0.2": version: 3.0.2 resolution: "@types/rimraf@npm:3.0.2" dependencies: @@ -9171,7 +9171,7 @@ __metadata: languageName: node linkType: hard -"@types/socket.io@npm:^3.0.2": +"@types/socket.io@npm:3.0.2": version: 3.0.2 resolution: "@types/socket.io@npm:3.0.2" dependencies: @@ -9313,7 +9313,7 @@ __metadata: languageName: node linkType: hard -"@types/vscode@npm:^1.63.1": +"@types/vscode@npm:1.63.1": version: 1.63.1 resolution: "@types/vscode@npm:1.63.1" checksum: 9b40bf77497358d9d4cd646aab39045de9cf7f508d6c92116c6e766f8db38b87b313b3e9e48ecb41d4d81f5b531aa4b257de624eea8bf117b2f28f6b8332394b @@ -9387,7 +9387,7 @@ __metadata: languageName: node linkType: hard -"@types/webpack-stats-plugin@npm:^0.3.2": +"@types/webpack-stats-plugin@npm:0.3.2": version: 0.3.2 resolution: "@types/webpack-stats-plugin@npm:0.3.2" dependencies: @@ -9471,7 +9471,7 @@ __metadata: languageName: node linkType: hard -"@types/yauzl@npm:^2.9.1, @types/yauzl@npm:^2.9.2": +"@types/yauzl@npm:2.10.0, @types/yauzl@npm:^2.9.1": version: 2.10.0 resolution: "@types/yauzl@npm:2.10.0" dependencies: @@ -29341,7 +29341,7 @@ pvutils@latest: "@types/d3-selection": 1.4.1 "@types/d3-shape": 1.3.2 "@types/d3-time-format": 3.0.0 - "@types/escape-html": ^1.0.1 + "@types/escape-html": 1.0.1 "@types/expect": 24.3.0 "@types/express": 4.17.11 "@types/fancy-log": 1.3.1 @@ -29351,35 +29351,35 @@ pvutils@latest: "@types/highlight.js": 9.12.4 "@types/is-absolute-url": 3.0.0 "@types/jest": 27.4.0 - "@types/js-base64": ^3.3.1 + "@types/js-base64": 3.3.1 "@types/js-cookie": 2.2.6 "@types/js-yaml": 4.0.3 "@types/jsdom": 12.2.4 "@types/lodash": 4.14.167 - "@types/lru-cache": ^7.6.1 + "@types/lru-cache": 7.6.1 "@types/marked": 4.0.3 "@types/mime-types": 2.1.0 "@types/mini-css-extract-plugin": 2.0.1 "@types/mocha": 8.2.0 - "@types/mock-require": ^2.0.1 + "@types/mock-require": 2.0.1 "@types/mockdate": 2.0.0 "@types/mz": 2.7.3 "@types/node": 13.13.5 "@types/node-fetch": 2.5.10 "@types/pollyjs__core": 4.3.1 "@types/pollyjs__persister-fs": 2.0.1 - "@types/puppeteer": ^5.4.5 + "@types/puppeteer": 5.4.5 "@types/react": 18.0.8 - "@types/react-calendar": ^3.5.2 + "@types/react-calendar": 3.5.2 "@types/react-circular-progressbar": 1.0.2 "@types/react-dom": 18.0.2 "@types/react-grid-layout": 1.3.0 - "@types/react-resizable": ^3.0.2 - "@types/react-router": ^5.1.18 - "@types/react-router-dom": ^5.3.3 + "@types/react-resizable": 3.0.2 + "@types/react-router": 5.1.18 + "@types/react-router-dom": 5.3.3 "@types/recharts": 1.8.23 "@types/resize-observer-browser": 0.1.4 - "@types/rimraf": ^3.0.2 + "@types/rimraf": 3.0.2 "@types/sanitize-html": 2.3.0 "@types/sass": 1.16.1 "@types/semver": 7.3.1 @@ -29387,7 +29387,7 @@ pvutils@latest: "@types/signale": 1.4.1 "@types/simmerjs": 0.5.1 "@types/sinon": 9.0.4 - "@types/socket.io": ^3.0.2 + "@types/socket.io": 3.0.2 "@types/socket.io-client": 1.4.33 "@types/speed-measure-webpack-plugin": 1.3.4 "@types/svgo": 2.6.0 @@ -29395,12 +29395,12 @@ pvutils@latest: "@types/testing-library__jest-dom": 5.9.5 "@types/textarea-caret": 3.0.0 "@types/uuid": 8.0.1 - "@types/vscode": ^1.63.1 + "@types/vscode": 1.63.1 "@types/webpack-bundle-analyzer": 4.4.1 "@types/webpack-dev-server": 4.0.3 "@types/webpack-manifest-plugin": 3.0.5 - "@types/webpack-stats-plugin": ^0.3.2 - "@types/yauzl": ^2.9.2 + "@types/webpack-stats-plugin": 0.3.2 + "@types/yauzl": 2.10.0 "@visx/annotation": ^2.10.0 "@visx/axis": ^2.11.1 "@visx/glyph": ^2.10.0