Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
build: update rust version
Browse files Browse the repository at this point in the history
  • Loading branch information
smhmayboudi committed Apr 30, 2022
1 parent c01b9af commit 9856042
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker.io/docker/dockerfile:1.3.1

ARG VARIANT="1.58.0-bullseye"
ARG VARIANT="1.60.0-bullseye"
FROM rust:${VARIANT}

ARG ADD_NON_FREE_PACKAGES="true"
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"build": {
"args": {
"VARIANT": "1.58.0-bullseye"
"VARIANT": "1.60.0-bullseye"
},
"dockerfile": "Dockerfile"
},
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/package/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker.io/docker/dockerfile:1.3.1

ARG RUST_VERSION="1.58.0-bullseye"
ARG RUST_VERSION="1.60.0-bullseye"
FROM rust:${RUST_VERSION}
RUN set -eux \
&& export DEBIAN_FRONTEND="noninteractive" \
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pull_request-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ env:
jobs:
audit:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
name: Cargo Audit
needs:
- clippy
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
timeout-minutes: 30
check:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
name: Cargo Check
needs:
- clippy
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
timeout-minutes: 30
deny-check:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
continue-on-error: ${{ matrix.checks == 'advisories' }}
name: Cargo Deny Check
needs:
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
timeout-minutes: 30
clippy:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
name: Cargo Clippy
permissions:
contents: read
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
timeout-minutes: 30
coverage:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
name: Coverage
needs:
- clippy
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
timeout-minutes: 30
fmt-check:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
name: Cargo Format Check
permissions:
contents: read
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
timeout-minutes: 30
test:
container:
image: docker://rust:1.58.0-bullseye
image: docker://rust:1.60.0-bullseye
name: Cargo Test
needs:
- clippy
Expand Down
18 changes: 9 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ rust_build:
DOCKER_HOST: tcp://127.0.0.1:2375
DOCKER_TLS_CERTDIR: ''
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand All @@ -91,7 +91,7 @@ rust_build:
DOCKER_HOST: tcp://127.0.0.1:2375
DOCKER_TLS_CERTDIR: ''
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand All @@ -105,7 +105,7 @@ rust_build:
variables:
CARGO: cargo
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand All @@ -127,7 +127,7 @@ rust_build:
CARGO: cargo
GRCOV_COVERAGE_TYPE: cobertura
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand All @@ -144,7 +144,7 @@ rust_build:
CARGO: cargo
PACKAGE_REGISTRY_URL: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE}/${VERSION}
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand Down Expand Up @@ -190,7 +190,7 @@ rust_build:
CARGO: cargo
PACKAGE_REGISTRY_URL: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE}/${VERSION}
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand All @@ -209,7 +209,7 @@ rust_build:
variables:
CARGO: cargo
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand All @@ -229,7 +229,7 @@ rust_build:
variables:
CARGO: cargo
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand Down Expand Up @@ -259,7 +259,7 @@ rust_build:
# MOUNT_POINT: /builds/${CI_PROJECT_PATH}/mnt
# MOUNT_POINT: ${CI_PROJECT_DIR}/mnt
RELEASE: --release
RUST_VERSION: 1.58.0-bullseye
RUST_VERSION: 1.60.0-bullseye
VERSION: ${CI_COMMIT_TAG}
when: manual

Expand Down
6 changes: 3 additions & 3 deletions doc/CROSS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
$ make release CARGO="cross" PACKAGE="fip_api" RELEASE="--release" STRIP="aarch64-linux-gnu-strip" TARGET="aarch64-unknown-linux-musl" VERSION="$(git describe --abbrev=0 --tags)"

# run before run the rest
$ docker build . --file ./.github/actions/package/Dockerfile --tag rust-build:1.58.0-bullseye
$ docker build . --file ./.github/actions/package/Dockerfile --tag rust-build:1.60.0-bullseye

# 2nd WAY
$ docker run --volume $(pwd):/workspace --volume /var/run/docker.sock:/var/run/docker.sock --workdir /workspace --rm rust-build:1.58.0-bullseye make release CARGO="cross" PACKAGE="fip_api" RELEASE="--release" STRIP="aarch64-linux-gnu-strip" TARGET="aarch64-unknown-linux-musl" VERSION="$(git describe --abbrev=0 --tags)"
$ docker run --volume $(pwd):/workspace --volume /var/run/docker.sock:/var/run/docker.sock --workdir /workspace --rm rust-build:1.60.0-bullseye make release CARGO="cross" PACKAGE="fip_api" RELEASE="--release" STRIP="aarch64-linux-gnu-strip" TARGET="aarch64-unknown-linux-musl" VERSION="$(git describe --abbrev=0 --tags)"

# 3rd WAY: devcontainer docker-from-docker
$ docker run --volume ${LOCAL_WORKSPACE_FOLDER}:/workspace --workdir /workspace --rm rust-build:1.58.0-bullseye make release CARGO="cross" PACKAGE="fip_api" RELEASE="--release" STRIP="aarch64-linux-gnu-strip" TARGET="aarch64-unknown-linux-musl" VERSION="$(git describe --abbrev=0 --tags)"
$ docker run --volume ${LOCAL_WORKSPACE_FOLDER}:/workspace --workdir /workspace --rm rust-build:1.60.0-bullseye make release CARGO="cross" PACKAGE="fip_api" RELEASE="--release" STRIP="aarch64-linux-gnu-strip" TARGET="aarch64-unknown-linux-musl" VERSION="$(git describe --abbrev=0 --tags)"
```
22 changes: 14 additions & 8 deletions doc/DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,31 @@

```shell
$ docker pull busybox:1.35.0-musl
$ docker pull curlimages/curl:7.81.0
$ docker pull curlimages/curl:7.83.0
$ docker pull gcr.io/distroless/base-debian11:nonroot
$ docker pull gcr.io/distroless/cc-debian11:nonroot
$ docker pull gcr.io/distroless/static-debian11:nonroot
$ docker pull ghcr.io/catthehacker/ubuntu:act-20.04
$ docker pull ghcr.io/catthehacker/ubuntu:full-20.04
$ docker pull ghcr.io/catthehacker/ubuntu:pwsh-20.04
$ docker pull ghcr.io/catthehacker/ubuntu:runner-20.04
$ docker pull jaegertracing/all-in-one:1.30.0
$ docker pull materialize/materialized:v0.16.0
$ docker pull ghcr.io/cross-rs/aarch64-unknown-linux-musl:main
$ docker pull ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main
$ docker pull ghcr.io/cross-rs/x86_64-unknown-linux-musl:main
$ docker pull jaegertracing/all-in-one:1.33.0
$ docker pull materialize/materialized:v0.26.0
# https://hub.docker.com/_/microsoft-vscode-devcontainers
$ docker pull mcr.microsoft.com/vscode/devcontainers/rust:1-bullseye
$ docker pull openzipkin/zipkin:2.23.9
$ docker pull registry:2.7.1
$ docker pull rust:1.58.0-bullseye
$ docker pull openzipkin/zipkin:2.23.16
$ docker pull registry:2.8.1
$ docker pull rust:1.60.0-alpine3.15
$ docker pull rust:1.60.0-bullseye
$ docker pull rust:1.60.0-slim-bullseye
$ docker pull rustembedded/cross:aarch64-unknown-linux-musl-0.2.1
$ docker pull rustembedded/cross:armv7-unknown-linux-musleabihf-0.2.1
$ docker pull rustembedded/cross:x86_64-unknown-linux-musl-0.2.1
$ docker pull timberio/vector:0.19.0-distroless-static
$ docker pull timberio/vector:0.21.1-distroless-static
$ docker pull tonistiigi/binfmt:qemu-v6.2.0
$ docker pull tonistiigi/xx:1.1.0
$ docker pull vectorized/redpanda:v21.11.2
$ docker pull vectorized/redpanda:v21.11.15
```
2 changes: 1 addition & 1 deletion fip_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ license = "MIT"
publish = false
readme = "fip_api/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_api"
Expand Down
2 changes: 1 addition & 1 deletion fip_api_attributes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ license = "MIT"
publish = false
readme = "fip_api_attributes/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_api_attributes"
Expand Down
2 changes: 1 addition & 1 deletion fip_at/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ license = "MIT"
publish = false
readme = "fip_at/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_at"
Expand Down
2 changes: 1 addition & 1 deletion fip_c/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ license = "MIT"
publish = false
readme = "fip_c/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_c"
Expand Down
2 changes: 1 addition & 1 deletion fip_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ license = "MIT"
publish = false
readme = "fip_common/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_common"
Expand Down
2 changes: 1 addition & 1 deletion fip_jwks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ license = "MIT"
publish = false
readme = "fip_jwks/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_jwks"
Expand Down
2 changes: 1 addition & 1 deletion fip_rt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ license = "MIT"
publish = false
readme = "fip_rt/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_rt"
Expand Down
2 changes: 1 addition & 1 deletion fip_user/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ license = "MIT"
publish = false
readme = "fip_user/README.md"
# resolver
rust-version = "1.58.0"
rust-version = "1.60.0"
repository = "https://github.com/smhmayboudi/fip"
# workspace
description = "fip_user"
Expand Down

0 comments on commit 9856042

Please sign in to comment.