TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '350-debian-package-from-docker-packager-result-doesn-t-seem-to-install-configuration-files' into 'next'

Browse source 
Fix CI + Debian packaging

Closes #350

See merge request famedly/conduit!474
This commit is contained in:
Jonas Zohren 2023-05-21 20:41:08 +00:00
commit 533bccad8f
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

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

6
Dockerfile
View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 WORKDIR /usr/src/conduit
# Install required packages to build Conduit and it's dependencies # 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: # 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 && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -57,7 +57,7 @@ WORKDIR /usr/src/conduit
COPY ./LICENSE ./LICENSE COPY ./LICENSE ./LICENSE
COPY ./README.md ./README.md 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 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 # --no-build makes cargo-deb reuse already compiled project