Skip to content

Commit 64e6953

Browse files
shepmastershepmaster
authored
Merge pull request #939 from rust-lang/docker-upgrade
2 parents 2293757 + 9841aac commit 64e6953

File tree

6 files changed

+40
-38
lines changed

6 files changed

+40
-38
lines changed

‎.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Docker Buildx
3434
uses: docker/setup-buildx-action@v2
3535
with:
36-
driver-opts: image=moby/buildkit:v0.9.1
36+
driver-opts: image=moby/buildkit:v0.11.6
3737
- name: Login to GitHub Container Registry
3838
uses: docker/login-action@v2
3939
with:
@@ -43,7 +43,7 @@ jobs:
4343
- name: Build and push 'toolchain' container
4444
env:
4545
TAG_PREFIX: "${{ env.IMAGE_NAME }}:toolchain"
46-
uses: docker/build-push-action@v3
46+
uses: docker/build-push-action@v4
4747
with:
4848
context: compiler/base/
4949
file: compiler/base/Dockerfile
@@ -59,7 +59,7 @@ jobs:
5959
- name: Build and push 'bare-sources' container
6060
env:
6161
TAG_PREFIX: "${{ env.IMAGE_NAME }}:bare-sources"
62-
uses: docker/build-push-action@v3
62+
uses: docker/build-push-action@v4
6363
with:
6464
context: compiler/base/
6565
file: compiler/base/Dockerfile
@@ -75,7 +75,7 @@ jobs:
7575
- name: Build and push 'munge' container
7676
env:
7777
TAG_PREFIX: "${{ env.IMAGE_NAME }}:munge"
78-
uses: docker/build-push-action@v3
78+
uses: docker/build-push-action@v4
7979
with:
8080
context: compiler/base/
8181
file: compiler/base/Dockerfile
@@ -91,7 +91,7 @@ jobs:
9191
- name: Build and push 'sources' container
9292
env:
9393
TAG_PREFIX: "${{ env.IMAGE_NAME }}:sources"
94-
uses: docker/build-push-action@v3
94+
uses: docker/build-push-action@v4
9595
with:
9696
context: compiler/base/
9797
file: compiler/base/Dockerfile
@@ -105,7 +105,7 @@ jobs:
105105
${{ env.TAG_PREFIX }}--latest
106106
cache-to: type=inline
107107
- name: Build and push container
108-
uses: docker/build-push-action@v3
108+
uses: docker/build-push-action@v4
109109
with:
110110
context: compiler/base/
111111
file: compiler/base/Dockerfile
@@ -138,15 +138,15 @@ jobs:
138138
- name: Set up Docker Buildx
139139
uses: docker/setup-buildx-action@v2
140140
with:
141-
driver-opts: image=moby/buildkit:v0.9.1
141+
driver-opts: image=moby/buildkit:v0.11.6
142142
- name: Login to GitHub Container Registry
143143
uses: docker/login-action@v2
144144
with:
145145
registry: ghcr.io
146146
username: "${{ env.GH_CONTAINER_REGISTRY_USERNAME }}"
147147
password: "${{ secrets.GH_CONTAINER_REGISTRY_TOKEN }}"
148148
- name: Build and push container
149-
uses: docker/build-push-action@v3
149+
uses: docker/build-push-action@v4
150150
with:
151151
context: compiler/${{ matrix.tool }}/
152152
file: compiler/${{ matrix.tool }}/Dockerfile

‎.github/workflows/cron.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Docker Buildx
3030
uses: docker/setup-buildx-action@v2
3131
with:
32-
driver-opts: image=moby/buildkit:v0.9.1
32+
driver-opts: image=moby/buildkit:v0.11.6
3333
- name: Login to GitHub Container Registry
3434
uses: docker/login-action@v2
3535
with:
@@ -44,7 +44,7 @@ jobs:
4444
- name: Build and push 'toolchain' container
4545
env:
4646
TAG_PREFIX: "${{ env.IMAGE_NAME }}:toolchain"
47-
uses: docker/build-push-action@v3
47+
uses: docker/build-push-action@v4
4848
with:
4949
context: compiler/base/
5050
file: compiler/base/Dockerfile
@@ -60,7 +60,7 @@ jobs:
6060
- name: Build and push 'bare-sources' container
6161
env:
6262
TAG_PREFIX: "${{ env.IMAGE_NAME }}:bare-sources"
63-
uses: docker/build-push-action@v3
63+
uses: docker/build-push-action@v4
6464
with:
6565
context: compiler/base/
6666
file: compiler/base/Dockerfile
@@ -76,7 +76,7 @@ jobs:
7676
- name: Build and push 'munge' container
7777
env:
7878
TAG_PREFIX: "${{ env.IMAGE_NAME }}:munge"
79-
uses: docker/build-push-action@v3
79+
uses: docker/build-push-action@v4
8080
with:
8181
context: compiler/base/
8282
file: compiler/base/Dockerfile
@@ -92,7 +92,7 @@ jobs:
9292
- name: Build and push 'sources' container
9393
env:
9494
TAG_PREFIX: "${{ env.IMAGE_NAME }}:sources"
95-
uses: docker/build-push-action@v3
95+
uses: docker/build-push-action@v4
9696
with:
9797
context: compiler/base/
9898
file: compiler/base/Dockerfile
@@ -106,7 +106,7 @@ jobs:
106106
${{ env.TAG_PREFIX }}--latest
107107
cache-to: type=inline
108108
- name: Build and push container
109-
uses: docker/build-push-action@v3
109+
uses: docker/build-push-action@v4
110110
with:
111111
context: compiler/base/
112112
file: compiler/base/Dockerfile
@@ -148,7 +148,7 @@ jobs:
148148
- name: Set up Docker Buildx
149149
uses: docker/setup-buildx-action@v2
150150
with:
151-
driver-opts: image=moby/buildkit:v0.9.1
151+
driver-opts: image=moby/buildkit:v0.11.6
152152
- name: Login to GitHub Container Registry
153153
uses: docker/login-action@v2
154154
with:
@@ -161,7 +161,7 @@ jobs:
161161
username: "${{ env.DOCKER_HUB_USERNAME }}"
162162
password: "${{ secrets.DOCKER_HUB_TOKEN }}"
163163
- name: Build and push container
164-
uses: docker/build-push-action@v3
164+
uses: docker/build-push-action@v4
165165
with:
166166
context: compiler/${{ matrix.tool }}/
167167
file: compiler/${{ matrix.tool }}/Dockerfile

‎ci/workflows.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ components:
2222
uses: docker/setup-buildx-action@v2
2323
with:
2424
driver-opts: >-
25-
image=moby/buildkit:v0.9.1
25+
image=moby/buildkit:v0.11.6
2626
2727
- login_ghcr: &login_ghcr
2828
name: "Login to GitHub Container Registry"
@@ -54,7 +54,7 @@ components:
5454
name: "Build and push 'toolchain' container"
5555
env:
5656
TAG_PREFIX: ${{ env.IMAGE_NAME }}:toolchain
57-
uses: docker/build-push-action@v3
57+
uses: docker/build-push-action@v4
5858
with:
5959
context: compiler/base/
6060
file: compiler/base/Dockerfile
@@ -74,7 +74,7 @@ components:
7474
name: "Build and push 'bare-sources' container"
7575
env:
7676
TAG_PREFIX: ${{ env.IMAGE_NAME }}:bare-sources
77-
uses: docker/build-push-action@v3
77+
uses: docker/build-push-action@v4
7878
with:
7979
context: compiler/base/
8080
file: compiler/base/Dockerfile
@@ -94,7 +94,7 @@ components:
9494
name: "Build and push 'munge' container"
9595
env:
9696
TAG_PREFIX: ${{ env.IMAGE_NAME }}:munge
97-
uses: docker/build-push-action@v3
97+
uses: docker/build-push-action@v4
9898
with:
9999
context: compiler/base/
100100
file: compiler/base/Dockerfile
@@ -114,7 +114,7 @@ components:
114114
name: "Build and push 'sources' container"
115115
env:
116116
TAG_PREFIX: ${{ env.IMAGE_NAME }}:sources
117-
uses: docker/build-push-action@v3
117+
uses: docker/build-push-action@v4
118118
with:
119119
context: compiler/base/
120120
file: compiler/base/Dockerfile
@@ -132,7 +132,7 @@ components:
132132

133133
- build_compiler_containers_final: &build_compiler_containers_final
134134
name: "Build and push container"
135-
uses: docker/build-push-action@v3
135+
uses: docker/build-push-action@v4
136136
with:
137137
context: compiler/base/
138138
file: compiler/base/Dockerfile
@@ -161,7 +161,7 @@ components:
161161

162162
- build_tool_containers_final: &build_tool_containers_final
163163
name: "Build and push container"
164-
uses: docker/build-push-action@v3
164+
uses: docker/build-push-action@v4
165165
with:
166166
context: compiler/${{ matrix.tool }}/
167167
file: compiler/${{ matrix.tool }}/Dockerfile

‎compiler/base/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ version = "=1.6.0"
9090

9191
[dependencies.arrayvec]
9292
package = "arrayvec"
93-
version = "=0.7.3"
93+
version = "=0.7.4"
9494
features = ["std"]
9595

9696
[dependencies.async_recursion]
@@ -221,11 +221,11 @@ features = ["percent-encode", "percent-encoding"]
221221

222222
[dependencies.cookie_store]
223223
package = "cookie_store"
224-
version = "=0.16.1"
224+
version = "=0.16.2"
225225

226226
[dependencies.cpufeatures]
227227
package = "cpufeatures"
228-
version = "=0.2.7"
228+
version = "=0.2.8"
229229

230230
[dependencies.crc32fast]
231231
package = "crc32fast"
@@ -1031,7 +1031,7 @@ version = "=1.0.164"
10311031

10321032
[dependencies.serde_json]
10331033
package = "serde_json"
1034-
version = "=1.0.96"
1034+
version = "=1.0.97"
10351035
features = ["raw_value", "std"]
10361036

10371037
[dependencies.serde_spanned]
@@ -1274,7 +1274,7 @@ features = ["attributes", "std", "tracing-attributes"]
12741274

12751275
[dependencies.tracing_attributes]
12761276
package = "tracing-attributes"
1277-
version = "=0.1.24"
1277+
version = "=0.1.25"
12781278

12791279
[dependencies.tracing_core]
12801280
package = "tracing-core"
@@ -1479,7 +1479,7 @@ version = "=1.6.0"
14791479

14801480
[build_dependencies.arrayvec]
14811481
package = "arrayvec"
1482-
version = "=0.7.3"
1482+
version = "=0.7.4"
14831483
features = ["std"]
14841484

14851485
[build_dependencies.async_recursion]
@@ -1610,11 +1610,11 @@ features = ["percent-encode", "percent-encoding"]
16101610

16111611
[build_dependencies.cookie_store]
16121612
package = "cookie_store"
1613-
version = "=0.16.1"
1613+
version = "=0.16.2"
16141614

16151615
[build_dependencies.cpufeatures]
16161616
package = "cpufeatures"
1617-
version = "=0.2.7"
1617+
version = "=0.2.8"
16181618

16191619
[build_dependencies.crc32fast]
16201620
package = "crc32fast"
@@ -2420,7 +2420,7 @@ version = "=1.0.164"
24202420

24212421
[build_dependencies.serde_json]
24222422
package = "serde_json"
2423-
version = "=1.0.96"
2423+
version = "=1.0.97"
24242424
features = ["raw_value", "std"]
24252425

24262426
[build_dependencies.serde_spanned]
@@ -2663,7 +2663,7 @@ features = ["attributes", "std", "tracing-attributes"]
26632663

26642664
[build_dependencies.tracing_attributes]
26652665
package = "tracing-attributes"
2666-
version = "=0.1.24"
2666+
version = "=0.1.25"
26672667

26682668
[build_dependencies.tracing_core]
26692669
package = "tracing-core"

‎compiler/base/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#syntax=docker/dockerfile:1.5
2+
13
FROM ubuntu:20.04 as toolchain
24

35
ARG channel

‎compiler/base/crate-information.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"name": "arrayvec",
74-
"version": "0.7.3",
74+
"version": "0.7.4",
7575
"id": "arrayvec"
7676
},
7777
{
@@ -216,12 +216,12 @@
216216
},
217217
{
218218
"name": "cookie_store",
219-
"version": "0.16.1",
219+
"version": "0.16.2",
220220
"id": "cookie_store"
221221
},
222222
{
223223
"name": "cpufeatures",
224-
"version": "0.2.7",
224+
"version": "0.2.8",
225225
"id": "cpufeatures"
226226
},
227227
{
@@ -1091,7 +1091,7 @@
10911091
},
10921092
{
10931093
"name": "serde_json",
1094-
"version": "1.0.96",
1094+
"version": "1.0.97",
10951095
"id": "serde_json"
10961096
},
10971097
{
@@ -1361,7 +1361,7 @@
13611361
},
13621362
{
13631363
"name": "tracing-attributes",
1364-
"version": "0.1.24",
1364+
"version": "0.1.25",
13651365
"id": "tracing_attributes"
13661366
},
13671367
{

0 commit comments

Comments
 (0)