diff options
| author | Jonas Zohren <git-pbkyr@jzohren.de> | 2023-05-21 20:41:08 +0000 |
|---|---|---|
| committer | Jonas Zohren <git-pbkyr@jzohren.de> | 2023-05-21 20:41:08 +0000 |
| commit | a4261aac767758c756512f6cf5c4173b8af80354 (patch) | |
| tree | 7aad080165a332f4683dfe05cfe48a34bcbf68aa /Dockerfile | |
| parent | c38df57279bfcc7953edf88ce73b2ffaa9e2cdb1 (diff) | |
| download | conduit-a4261aac767758c756512f6cf5c4173b8af80354.zip | |
* 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
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |