diff --git a/Cargo.toml b/Cargo.toml index e6a1c22..5d266bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "cerk", diff --git a/README.md b/README.md index 596e9a8..f381d02 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Different Docker-based development environments can be found [here](https://gith ### Prerequisites without Docker 1. latest version of [rustup](https://www.rust-lang.org/tools/install) -2. Rust version 1.67.0: `rustup install 1.67.0` +2. Rust version 1.72.0: `rustup install 1.72` 3. Additional C libraries depending on the platform (examples can be found in the Docker containers) Optional Tooling: diff --git a/docker-compose.yml b/docker-compose.yml index bdf6f7a..d30a39f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: test: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - .:/cerk/ - ./lib/libmosquitto.so.1:/usr/local/lib/libmosquitto.so @@ -15,19 +15,19 @@ services: && cargo fmt -- --check " doc: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - .:/cerk/ working_dir: /cerk command: cargo doc --all check-readme: - image: lazzaretti/ce-rust-docker-cargo-readme:3.2.0 + image: ghcr.io/ce-rust/cargo-readme:v3.3.0 volumes: - .:/cerk/ working_dir: /cerk command: ./check-readme.sh deny: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - .:/cerk/ working_dir: /cerk diff --git a/docker/cerk-common/Dockerfile b/docker/cerk-common/Dockerfile index 13408e2..638dda9 100644 --- a/docker/cerk-common/Dockerfile +++ b/docker/cerk-common/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 lazzaretti/docker-rust-cerk:0.7.0 as build-env +FROM --platform=linux/amd64 ghcr.io/ce-rust/rust-cerk:v0.8.0 as build-env WORKDIR /app # add missing libraries, inspired by https://github.com/kyos0109/varnish60-distroless/blob/master/Dockerfile diff --git a/examples/examples/src/mqtt/docker-compose.yml b/examples/examples/src/mqtt/docker-compose.yml index 957daea..eb2d0f3 100644 --- a/examples/examples/src/mqtt/docker-compose.yml +++ b/examples/examples/src/mqtt/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: cerk-publisher: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 environment: - RUST_BACKTRACE=1 volumes: @@ -14,7 +14,7 @@ services: links: - mqtt-broker cerk-subscriber: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - ../../../../:/cerk/ working_dir: /cerk/examples/examples diff --git a/examples/examples/src/sequence_to_amqp_to_printer/docker-compose.yml b/examples/examples/src/sequence_to_amqp_to_printer/docker-compose.yml index d003855..557da32 100644 --- a/examples/examples/src/sequence_to_amqp_to_printer/docker-compose.yml +++ b/examples/examples/src/sequence_to_amqp_to_printer/docker-compose.yml @@ -7,7 +7,7 @@ services: - 5672:5672 - 15672:15672 cerk-consumer: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - ../../../../:/cerk/ working_dir: /cerk @@ -19,7 +19,7 @@ services: links: - rabbitmq cerk-publisher: - image: lazzaretti/docker-rust-cerk:0.7.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - ../../../../:/cerk/ working_dir: /cerk diff --git a/integration-tests/reliable-amqp/docker-compose.yml b/integration-tests/reliable-amqp/docker-compose.yml index f84078c..f6bf591 100644 --- a/integration-tests/reliable-amqp/docker-compose.yml +++ b/integration-tests/reliable-amqp/docker-compose.yml @@ -7,7 +7,7 @@ services: - 5672:5672 - 15672:15672 cerk-amqp: - image: lazzaretti/docker-rust-cerk:0.6.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - ../../:/cerk/ working_dir: /cerk/integration-tests/reliable-amqp/cerk-amqp @@ -19,7 +19,7 @@ services: links: - rabbitmq test-executor: - image: lazzaretti/docker-rust-cerk:0.6.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - ../../:/cerk/ working_dir: /cerk/integration-tests/reliable-amqp/test-executor diff --git a/integration-tests/reliable-mqtt/docker-compose.yml b/integration-tests/reliable-mqtt/docker-compose.yml index 852307b..0f56b8f 100644 --- a/integration-tests/reliable-mqtt/docker-compose.yml +++ b/integration-tests/reliable-mqtt/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - 1884:1883 cerk: - image: lazzaretti/docker-rust-cerk:0.6.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 environment: - MOSQUITTO_GIT_URL=https://github.com/ce-rust/mosquitto - MOSQUITTO_GIT_HASH=9f834dff9095e6731937d5eac767dbaca46491ac @@ -29,7 +29,7 @@ services: - limited - unlimited test-executor: - image: lazzaretti/docker-rust-cerk:0.6.0 + image: ghcr.io/ce-rust/rust-cerk:v0.8.0 volumes: - ../../:/cerk/ working_dir: /cerk/integration-tests/reliable-mqtt/test-executor