From a3a9b60abc39fd9d140a67831761d598887f195c Mon Sep 17 00:00:00 2001
From: Jonas Zohren <git-pbkyr@jzohren.de>
Date: Sat, 10 Jun 2023 15:35:22 +0000
Subject: [PATCH] chore(ci): Adjust to rust version bumps

---
 .gitlab-ci.yml | 8 ++------
 Dockerfile     | 6 ++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24db9f4d..b7df56fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ docker:tags:
 
 cargo check:
   stage: test
-  image: docker.io/rust:1.69.0-bullseye
+  image: docker.io/rust:1.70.0-bullseye
   needs: []
   interruptible: true
   before_script:
@@ -135,11 +135,7 @@ test:cargo:
     - apt-get update && apt-get -y --no-install-recommends install libclang-dev # dependency for rocksdb
   script:
     - rustc --version && cargo --version # Print version info for debugging
-    - "cargo test --color always --workspace --verbose --locked --no-fail-fast -- -Z unstable-options --format json | gitlab-report -p test > $CI_PROJECT_DIR/report.xml"
-  artifacts:
-    when: always
-    reports:
-      junit: report.xml
+    - "cargo test --color always --workspace --verbose --locked --no-fail-fast"
 
 test:clippy:
   extends: .test-shared-settings
diff --git a/Dockerfile b/Dockerfile
index 32ba81f3..943f6864 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 # syntax=docker/dockerfile:1
-FROM docker.io/rust:1.69-bullseye AS builder
+FROM docker.io/rust:1.70-bullseye AS base
+
+FROM base AS builder
 WORKDIR /usr/src/conduit
 
 # Install required packages to build Conduit and it's dependencies
@@ -37,7 +39,7 @@ COPY --from=builder /usr/src/conduit/target/release/conduit /conduit
 # ---------------------------------------------------------------------------------------------------------------
 # Build cargo-deb, a tool to package up rust binaries into .deb packages for Debian/Ubuntu based systems:
 # ---------------------------------------------------------------------------------------------------------------
-FROM docker.io/rust:1.69-bullseye AS build-cargo-deb
+FROM base AS build-cargo-deb
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \