* Fix Debian builds by actually including the whole `debian` directory into deb creation

* Fix CI by explicitly setting hostname of docker in docker service
* Fix Docker build by bumping the Rust version to 1.69
* Fix cargo check in CI by bumping the Rust version to 1.69
This commit is contained in:
Jonas Zohren 2023-05-21 20:41:08 +00:00
parent c38df57279
commit a4261aac76
2 changed files with 6 additions and 5 deletions

View File

@ -28,7 +28,8 @@ variables:
# Famedly runners use BTRFS, overlayfs and overlay2 often break jobs
DOCKER_DRIVER: btrfs
services:
- docker:dind
- name: docker:dind
alias: docker
script:
- apk add openssh-client
- eval $(ssh-agent -s)
@ -109,7 +110,7 @@ docker:tags:
cargo check:
stage: test
image: docker.io/rust:1.64.0-bullseye
image: docker.io/rust:1.69.0-bullseye
needs: []
interruptible: true
before_script:

View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM docker.io/rust:1.64-bullseye AS builder
FROM docker.io/rust:1.69-bullseye AS builder
WORKDIR /usr/src/conduit
# Install required packages to build Conduit and it's dependencies
@ -37,7 +37,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.64-bullseye AS build-cargo-deb
FROM docker.io/rust:1.69-bullseye AS build-cargo-deb
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@ -57,7 +57,7 @@ WORKDIR /usr/src/conduit
COPY ./LICENSE ./LICENSE
COPY ./README.md ./README.md
COPY debian/README.Debian ./debian/
COPY debian ./debian
COPY --from=build-cargo-deb /usr/local/cargo/bin/cargo-deb /usr/local/cargo/bin/cargo-deb
# --no-build makes cargo-deb reuse already compiled project