Skip to content

Commit 529c39c

Browse files
authored
Update Rust, Crates and GHA (dani-garcia#4783)
- Update Rust to v1.80.0 - Updated GitHub Actions - Updated crates
1 parent b428481 commit 529c39c

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

.github/workflows/release.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ jobs:
6363
fetch-depth: 0
6464

6565
- name: Initialize QEMU binfmt support
66-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
66+
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
6767
with:
6868
platforms: "arm64,arm"
6969

7070
# Start Docker Buildx
7171
- name: Setup Docker Buildx
72-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
72+
uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
7373
# https://github.com/moby/buildkit/issues/3969
7474
# Also set max parallelism to 3, the default of 4 breaks GitHub Actions and causes OOMKills
7575
with:
@@ -102,7 +102,7 @@ jobs:
102102

103103
# Login to Docker Hub
104104
- name: Login to Docker Hub
105-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
105+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.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@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
119+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
120120
with:
121121
registry: ghcr.io
122122
username: ${{ github.repository_owner }}
@@ -131,7 +131,7 @@ jobs:
131131
132132
# Login to Quay.io
133133
- name: Login to Quay.io
134-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
134+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
135135
with:
136136
registry: quay.io
137137
username: ${{ secrets.QUAY_USERNAME }}
@@ -165,7 +165,7 @@ jobs:
165165
echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/vaultwarden/server" | tee -a "${GITHUB_ENV}"
166166
167167
- name: Bake ${{ matrix.base_image }} containers
168-
uses: docker/bake-action@1c5f18a523c4c68524cfbc5161494d8bb5b29d20 # v5.0.1
168+
uses: docker/bake-action@a4d7f0b5b91c14a296d792d4ec53a9db17f02e67 # v5.5.0
169169
env:
170170
BASE_TAGS: "${{ env.BASE_TAGS }}"
171171
SOURCE_COMMIT: "${{ env.SOURCE_COMMIT }}"
@@ -223,28 +223,28 @@ jobs:
223223
224224
# Upload artifacts to Github Actions
225225
- name: "Upload amd64 artifact"
226-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
226+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
227227
if: ${{ matrix.base_image == 'alpine' }}
228228
with:
229229
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-amd64
230230
path: vaultwarden-amd64
231231

232232
- name: "Upload arm64 artifact"
233-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
233+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
234234
if: ${{ matrix.base_image == 'alpine' }}
235235
with:
236236
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-arm64
237237
path: vaultwarden-arm64
238238

239239
- name: "Upload armv7 artifact"
240-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
240+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
241241
if: ${{ matrix.base_image == 'alpine' }}
242242
with:
243243
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-armv7
244244
path: vaultwarden-armv7
245245

246246
- name: "Upload armv6 artifact"
247-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
247+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
248248
if: ${{ matrix.base_image == 'alpine' }}
249249
with:
250250
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-armv6

.github/workflows/trivy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
2929

3030
- name: Run Trivy vulnerability scanner
31-
uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0
31+
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
3232
with:
3333
scan-type: repo
3434
ignore-unfixed: true

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.5.0
4+
rev: v4.6.0
55
hooks:
66
- id: check-yaml
77
- id: check-json

Cargo.lock

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "vaultwarden"
33
version = "1.0.0"
44
authors = ["Daniel García <[email protected]>"]
55
edition = "2021"
6-
rust-version = "1.78.0"
6+
rust-version = "1.79.0"
77
resolver = "2"
88

99
repository = "https://github.com/dani-garcia/vaultwarden"

docker/DockerSettings.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vault_image_digest: "sha256:1a867b4b175e85fc8602314bd83bc263c76c49787031704f16a2
44
# Cross Compile Docker Helper Scripts v1.4.0
55
# We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts
66
xx_image_digest: "sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4"
7-
rust_version: 1.79.0 # Rust version to be used
7+
rust_version: 1.80.0 # Rust version to be used
88
debian_version: bookworm # Debian release name to be used
99
alpine_version: "3.20" # Alpine version to be used
1010
# For which platforms/architectures will we try to build images

docker/Dockerfile.alpine

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:1a867b4b175e8
3232
########################## ALPINE BUILD IMAGES ##########################
3333
## NOTE: The Alpine Base Images do not support other platforms then linux/amd64
3434
## And for Alpine we define all build images here, they will only be loaded when actually used
35-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.79.0 AS build_amd64
36-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.79.0 AS build_arm64
37-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.79.0 AS build_armv7
38-
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.79.0 AS build_armv6
35+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.80.0 AS build_amd64
36+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.80.0 AS build_arm64
37+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.80.0 AS build_armv7
38+
FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.80.0 AS build_armv6
3939

4040
########################## BUILD IMAGE ##########################
4141
# hadolint ignore=DL3006

docker/Dockerfile.debian

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:0cd3f05c72d6c9b038eb1
3636

3737
########################## BUILD IMAGE ##########################
3838
# hadolint ignore=DL3006
39-
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.79.0-slim-bookworm AS build
39+
FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.80.0-slim-bookworm AS build
4040
COPY --from=xx / /
4141
ARG TARGETARCH
4242
ARG TARGETVARIANT

0 commit comments

Comments
 (0)