Skip to content

Commit

Permalink
Merge branch 'develop' into feature/deprecate_website
Browse files Browse the repository at this point in the history
  • Loading branch information
ja573 authored Feb 12, 2024
2 parents 98a93df + 2a11b05 commit 48f9c85
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Changed
- [553](https://github.com/thoth-pub/thoth/pull/553) - Upgrade rust to `1.76.0` in production and development `Dockerfile`
- [549](https://github.com/thoth-pub/thoth/pull/549) - Build and push staging docker images on pull requests
- [549](https://github.com/thoth-pub/thoth/pull/549) - Upgrade docker GitHub actions dependencies (`docker/setup-qemu-action@v3`, `docker/setup-buildx-action@v3`, `docker/login-action@v3`, `docker/build-push-action@v5`)

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG RUST_IMAGE=rust:1.75.0
ARG MUSL_IMAGE=clux/muslrust:1.75.0
ARG RUST_IMAGE=rust:1.76.0
ARG MUSL_IMAGE=clux/muslrust:1.76.0

FROM ${RUST_IMAGE} as wasm

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUST_VERSION=1.75.0
ARG RUST_VERSION=1.76.0

FROM rust:${RUST_VERSION}

Expand Down

0 comments on commit 48f9c85

Please sign in to comment.