Skip to content

Commit 856a30c

Browse files
committed
lots of build fixes for new packaging including libssl
Signed-off-by: Erik Hollensbe <git@hollensbe.org>
1 parent a40ff22 commit 856a30c

File tree

6 files changed

+29
-11
lines changed

6 files changed

+29
-11
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:latest as rustenv
1+
FROM debian:latest as rustenv
22

33
ARG IS_LOCAL=0
44
ARG VERSION=main

Dockerfile.alpine

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@
88

99
FROM alpine:latest as builder
1010

11-
RUN apk add rust
12-
RUN apk add cargo
11+
RUN apk add gcc
12+
RUN apk add libgcc
13+
RUN apk add musl-dev
1314
RUN apk add openssl
1415
RUN apk add openssl-dev
16+
RUN apk add curl
17+
18+
RUN curl -sSL sh.rustup.rs >/usr/local/bin/rustup-dl && chmod +x /usr/local/bin/rustup-dl && /usr/local/bin/rustup-dl -y --default-toolchain stable
1519

1620
COPY . /zeronsd
1721
WORKDIR /zeronsd
1822

19-
RUN cargo install --path .
23+
ENV PATH=/root/.cargo/bin:${PATH}
24+
RUN . /root/.cargo/env && cargo install --path .
2025

2126
FROM alpine:latest
2227

Dockerfile.packages

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
FROM rust
1+
FROM debian:latest as rustenv
22

3-
RUN cargo install cargo-deb cargo-generate-rpm
3+
RUN apt-get update -qq && apt-get install curl pkg-config build-essential libssl1.1 ca-certificates -y && apt-get autoclean -y && apt-get clean -y
4+
RUN curl -sSL sh.rustup.rs >/usr/local/bin/rustup-dl && chmod +x /usr/local/bin/rustup-dl && /usr/local/bin/rustup-dl -y --default-toolchain stable
5+
6+
FROM rustenv as buildenv
7+
8+
RUN . /root/.cargo/env && cargo install cargo-deb cargo-generate-rpm

Dockerfile.ubi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# vim: ft=dockerfile
2+
FROM redhat/ubi8
3+
4+
RUN dnf install openssl-devel gcc -y
5+
RUN curl -sSL sh.rustup.rs >/tmp/rustup.sh && bash /tmp/rustup.sh -y
6+
ENV PATH=${PATH}:${HOME}/.cargo/bin
7+
RUN . /root/.cargo/env && cargo install cargo-generate-rpm

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ docker-image-push: docker-image-package
4040
packages:
4141
make docker-image-package
4242
mkdir -p target/packages
43+
docker build -f Dockerfile.ubi -t zeronsd-packages-ubi .
44+
docker run -it -v ${PWD}:/code -w /code --rm zeronsd-packages-ubi bash -c ". /root/.cargo/env && cargo build --release && cargo generate-rpm && mv /code/target/generate-rpm/*.rpm /code/target/packages"
4345
docker build -f Dockerfile.ubuntu -t zeronsd-packages-ubuntu .
4446
docker run -it -v ${PWD}:/code -w /code --rm zeronsd-packages-ubuntu bash -c "cargo deb --deb-version ${CARGO_VERSION}-ubuntu22 && mv /code/target/debian/*.deb /code/target/packages"
4547
docker build -f Dockerfile.packages -t zeronsd-packages .
46-
docker run -it -v ${PWD}:/code -w /code --rm zeronsd-packages bash -c "cargo deb && cargo-generate-rpm && mv /code/target/debian/*.deb /code/target/generate-rpm/*.rpm /code/target/packages "
48+
docker run -it -v ${PWD}:/code -w /code --rm zeronsd-packages bash -c ". /root/.cargo/env && cargo deb && mv /code/target/debian/*.deb /code/target/packages"
4749
make packages-out
4850

4951
packages-out:
@@ -61,9 +63,8 @@ clean:
6163
sudo rm -rf target
6264
cargo clean
6365

64-
test-packages: clean
65-
make packages
66-
docker run -v ${PWD}:/code --rm -it centos rpm -ivh /code/target/packages/\*.rpm
66+
test-packages: clean packages
67+
docker run -v ${PWD}:/code --rm -it redhat/ubi8 bash -c "rpm -ivh /code/target/packages/\*.rpm"
6768
docker run -v ${PWD}:/code --rm -it debian:latest bash -c "apt update -qq && apt install libssl1.1 && dpkg -i /code/target/packages/zeronsd_${CARGO_VERSION}_amd64.deb"
6869
docker run -v ${PWD}:/code --rm -it ubuntu:focal bash -c "apt update -qq && apt install libssl1.1 && dpkg -i /code/target/packages/zeronsd_${CARGO_VERSION}_amd64.deb"
6970
docker run -v ${PWD}:/code --rm -it ubuntu:jammy bash -c "apt update -qq && apt install libssl3 && dpkg -i /code/target/packages/zeronsd_${CARGO_VERSION}-ubuntu22_amd64.deb"

0 commit comments

Comments
 (0)