Skip to content

Commit 55fdee3

Browse files
authored
Update crates, web-vault and GHA (dani-garcia#4648)
- Updated all crates including Diesel and the new mysqlclient-sys - Updated the MSRV to v1.78 as that is what Diesel mandates - Added the mimalloc crate as a patch for now to fix armv6 static builds This probably makes dani-garcia#4606 possible - Updated web-vault to v2024.5.1 - Updated GitHub Actions Fixed an issue with the localhost images for extracting the musl binaries.
1 parent 377969e commit 55fdee3

File tree

10 files changed

+299
-278
lines changed

10 files changed

+299
-278
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
# Checkout the repo
4848
- name: "Checkout"
49-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
49+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
5050
# End Checkout the repo
5151

5252

@@ -74,7 +74,7 @@ jobs:
7474

7575
# Only install the clippy and rustfmt components on the default rust-toolchain
7676
- name: "Install rust-toolchain version"
77-
uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master @ Apr 14, 2024, 9:02 PM GMT+2
77+
uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 # master @ Jun 13, 2024, 6:20 PM GMT+2
7878
if: ${{ matrix.channel == 'rust-toolchain' }}
7979
with:
8080
toolchain: "${{steps.toolchain.outputs.RUST_TOOLCHAIN}}"
@@ -84,7 +84,7 @@ jobs:
8484

8585
# Install the any other channel to be used for which we do not execute clippy and rustfmt
8686
- name: "Install MSRV version"
87-
uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master @ Apr 14, 2024, 9:02 PM GMT+2
87+
uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 # master @ Jun 13, 2024, 6:20 PM GMT+2
8888
if: ${{ matrix.channel != 'rust-toolchain' }}
8989
with:
9090
toolchain: "${{steps.toolchain.outputs.RUST_TOOLCHAIN}}"

.github/workflows/hadolint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
# Checkout the repo
1515
- name: Checkout
16-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
16+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1717
# End Checkout the repo
1818

1919
# Download hadolint - https://github.com/hadolint/hadolint/releases

.github/workflows/release.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
steps:
5959
# Checkout the repo
6060
- name: Checkout
61-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
61+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6262
with:
6363
fetch-depth: 0
6464

@@ -71,11 +71,11 @@ jobs:
7171
- name: Setup Docker Buildx
7272
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
7373
# https://github.com/moby/buildkit/issues/3969
74-
# Also set max parallelism to 2, the default of 4 breaks GitHub Actions
74+
# Also set max parallelism to 3, the default of 4 breaks GitHub Actions and causes OOMKills
7575
with:
7676
buildkitd-config-inline: |
7777
[worker.oci]
78-
max-parallelism = 2
78+
max-parallelism = 3
7979
driver-opts: |
8080
network=host
8181
@@ -102,7 +102,7 @@ jobs:
102102

103103
# Login to Docker Hub
104104
- name: Login to Docker Hub
105-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
105+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
106106
with:
107107
username: ${{ secrets.DOCKERHUB_USERNAME }}
108108
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -116,7 +116,7 @@ jobs:
116116
117117
# Login to GitHub Container Registry
118118
- name: Login to GitHub Container Registry
119-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
119+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
120120
with:
121121
registry: ghcr.io
122122
username: ${{ github.repository_owner }}
@@ -137,7 +137,7 @@ jobs:
137137
138138
# Login to Quay.io
139139
- name: Login to Quay.io
140-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
140+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
141141
with:
142142
registry: quay.io
143143
username: ${{ secrets.QUAY_USERNAME }}
@@ -171,7 +171,7 @@ jobs:
171171
echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/vaultwarden/server" | tee -a "${GITHUB_ENV}"
172172
173173
- name: Bake ${{ matrix.base_image }} containers
174-
uses: docker/bake-action@73b0efa7a0e8ac276e0a8d5c580698a942ff10b5 # v4.4.0
174+
uses: docker/bake-action@1c5f18a523c4c68524cfbc5161494d8bb5b29d20 # v5.0.1
175175
env:
176176
BASE_TAGS: "${{ env.BASE_TAGS }}"
177177
SOURCE_COMMIT: "${{ env.SOURCE_COMMIT }}"
@@ -204,28 +204,28 @@ jobs:
204204
# This is needed because using different platforms doesn't trigger a new pull/download
205205
206206
# Extract amd64 binary
207-
docker create --name amd64 --platform=linux/amd64 "vaultwarden/server:${EXTRACT_TAG}-alpine"
207+
docker create --name amd64 --platform=linux/amd64 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
208208
docker cp amd64:/vaultwarden vaultwarden-amd64
209209
docker rm --force amd64
210-
docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine"
210+
docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
211211
212212
# Extract arm64 binary
213-
docker create --name arm64 --platform=linux/arm64 "vaultwarden/server:${EXTRACT_TAG}-alpine"
213+
docker create --name arm64 --platform=linux/arm64 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
214214
docker cp arm64:/vaultwarden vaultwarden-arm64
215215
docker rm --force arm64
216-
docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine"
216+
docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
217217
218218
# Extract armv7 binary
219-
docker create --name armv7 --platform=linux/arm/v7 "vaultwarden/server:${EXTRACT_TAG}-alpine"
219+
docker create --name armv7 --platform=linux/arm/v7 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
220220
docker cp armv7:/vaultwarden vaultwarden-armv7
221221
docker rm --force armv7
222-
docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine"
222+
docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
223223
224224
# Extract armv6 binary
225-
docker create --name armv6 --platform=linux/arm/v6 "vaultwarden/server:${EXTRACT_TAG}-alpine"
225+
docker create --name armv6 --platform=linux/arm/v6 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
226226
docker cp armv6:/vaultwarden vaultwarden-armv6
227227
docker rm --force armv6
228-
docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine"
228+
docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
229229
230230
# Upload artifacts to Github Actions
231231
- name: "Upload amd64 artifact"

.github/workflows/trivy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
actions: read
2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
28+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
2929

3030
- name: Run Trivy vulnerability scanner
31-
uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.0
31+
uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0
3232
with:
3333
scan-type: repo
3434
ignore-unfixed: true
@@ -37,6 +37,6 @@ jobs:
3737
severity: CRITICAL,HIGH
3838

3939
- name: Upload Trivy scan results to GitHub Security tab
40-
uses: github/codeql-action/upload-sarif@2bbafcdd7fbf96243689e764c2f15d9735164f33 # v3.25.3
40+
uses: github/codeql-action/upload-sarif@2bbafcdd7fbf96243689e764c2f15d9735164f33 # v3.25.10
4141
with:
4242
sarif_file: 'trivy-results.sarif'

0 commit comments

Comments
 (0)