From 5ee7ec45f686655da3631553a7168769cb905a17 Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Thu, 28 Nov 2024 16:42:52 +0000 Subject: [PATCH 1/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c74d837fc..74e9ee3a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed + - Upgrade rust to `1.83.0` in production and development `Dockerfile` - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `rustls` to v0.23.19 - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `chrono` to v0.4.38 - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `uuid` to v0.11.0 From 6784712c87039d6b5303b9b469a841404554256d Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Mon, 2 Dec 2024 10:21:33 +0000 Subject: [PATCH 2/5] Upgrade rust 1.83.0 --- Dockerfile | 2 +- Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87bffc394..f78b75152 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG MUSL_IMAGE=clux/muslrust:1.82.0-stable +ARG MUSL_IMAGE=clux/muslrust:1.83.0-stable FROM ${MUSL_IMAGE} as build diff --git a/Dockerfile.dev b/Dockerfile.dev index aa89215fd..493bc0973 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG RUST_VERSION=1.82.0 +ARG RUST_VERSION=1.83.0 FROM rust:${RUST_VERSION} From f428121802974ed0e3eab15f7dc02395e27a19e2 Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Mon, 2 Dec 2024 10:22:19 +0000 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74e9ee3a8..990f3eb43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed - - Upgrade rust to `1.83.0` in production and development `Dockerfile` + - [660](https://github.com/thoth-pub/thoth/pull/660) - Upgrade rust to `1.83.0` in production and development `Dockerfile` - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `rustls` to v0.23.19 - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `chrono` to v0.4.38 - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `uuid` to v0.11.0 From 50695b9e1db7838453f8bfdd71f88388f569e9a7 Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Mon, 2 Dec 2024 10:38:46 +0000 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 990f3eb43..d7d84785e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed - - [660](https://github.com/thoth-pub/thoth/pull/660) - Upgrade rust to `1.83.0` in production and development `Dockerfile` + - [660](https://github.com/thoth-pub/thoth/pull/660) - Upgrade rust to `1.83.0` in production `Dockerfile` + - [660](https://github.com/thoth-pub/thoth/pull/660) - Use latest tag in development `Dockerfile` - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `rustls` to v0.23.19 - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `chrono` to v0.4.38 - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `uuid` to v0.11.0 From ca1b892ca9e40a1759d298d22f70c4677491d501 Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Mon, 2 Dec 2024 10:38:55 +0000 Subject: [PATCH 5/5] Use rust:latest --- Dockerfile.dev | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 493bc0973..7e043cc39 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,6 +1,4 @@ -ARG RUST_VERSION=1.83.0 - -FROM rust:${RUST_VERSION} +FROM rust ENV TRUNK_VERSION=0.21.4