reactor
/
ptth
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🐳 Fix Docker

main
_ 2020-11-29 23:47:02 +00:00
parent 7925d9be95
commit 14df0bdf92
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -8,7 +8,7 @@ RUN apt-get update \
# Make sure the dependencies are all cached so we won't hammer crates.io # Make sure the dependencies are all cached so we won't hammer crates.io
ADD old-git.tar.gz . ADD old-git.tar.gz .
RUN git checkout bbb88c01e8ad28d256c8faf316f46d7214184ec2 \ RUN git checkout 7925d9be95df600c84efd084ec77c81c0da3e651 \
&& git reset --hard \ && git reset --hard \
&& cargo check -p ptth_relay && cargo check -p ptth_relay
@ -21,7 +21,7 @@ ARG gitcommithash=HEAD
RUN git checkout "$gitcommithash" \ RUN git checkout "$gitcommithash" \
&& git reset --hard \ && git reset --hard \
&& echo "pub const GIT_VERSION: Option <&str> = Some (\"$(git rev-parse HEAD)\");" > src/git_version.rs \ && echo "pub const GIT_VERSION: Option <&str> = Some (\"$(git rev-parse HEAD)\");" > crates/ptth_relay/src/git_version.rs \
&& cargo test --release --all \ && cargo test --release --all \
&& cargo build --release -p ptth_relay && cargo build --release -p ptth_relay
@ -32,7 +32,7 @@ RUN apt-get update \
&& apt-get upgrade -y && apt-get upgrade -y
COPY --from=build /usr/src/target/release/ptth_relay /root COPY --from=build /usr/src/target/release/ptth_relay /root
COPY --from=build /usr/src/src/git_version.rs /root/git_version.rs COPY --from=build /usr/src/crates/ptth-relay/src/git_version.rs /root/git_version.rs
COPY --from=build /usr/src/handlebars /root/handlebars COPY --from=build /usr/src/handlebars /root/handlebars
WORKDIR /root WORKDIR /root