Skip to content

Commit a40ff22

Browse files
committed
packaging fixups for progentior usage of rustfmt
Signed-off-by: Erik Hollensbe <git@hollensbe.org>
1 parent 44424b8 commit a40ff22

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ target
22
.git
33
test-token.txt
44
.token
5-
Dockerfile.*
5+
Dockerfile*
6+
Dockerfile
67
Makefile

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
FROM rust:latest as buildenv
1+
FROM ubuntu:latest as rustenv
22

33
ARG IS_LOCAL=0
44
ARG VERSION=main
55
ARG IS_TAG=0
66

77
COPY . /code
88
WORKDIR /code
9+
RUN apt-get update -qq && apt-get install curl pkg-config build-essential libssl-dev ca-certificates -y && apt-get autoclean -y && apt-get clean -y
10+
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
11+
12+
FROM rustenv as buildenv
13+
914
RUN sh cargo-docker.sh
1015

1116
FROM debian:latest
12-
13-
RUN apt-get update -qq && apt-get install libssl1.1 ca-certificates -y && apt-get autoclean -y && apt-get clean -y
14-
COPY --from=buildenv /usr/local/cargo/bin/zeronsd /usr/bin/zeronsd
17+
COPY --from=buildenv /root/.cargo/bin/zeronsd /usr/bin/zeronsd
1518

1619
ENTRYPOINT ["/usr/bin/zeronsd"]

cargo-docker.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3+
export PATH="${HOME}/.cargo/bin:${PATH}"
4+
35
if [ "${IS_LOCAL}" != 0 ]
46
then
57
cargo install --path .

0 commit comments

Comments
 (0)