rookeries
/
rookeries
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity

cli: Fix up issue with the Git revision not added in Docker build.

This commit is contained in:
Dorian 2020-02-23 12:42:20 -05:00
parent edea45d4c8
commit 6f0d3d787a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -8,7 +8,7 @@ RUN rustup component add rustfmt clippy \
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y chromium chromium-driver zip nodejs && apt-get install -y chromium chromium-driver zip nodejs git
# Caches Rust builds # Caches Rust builds
WORKDIR /app/rookeries/ WORKDIR /app/rookeries/
@ -30,6 +30,7 @@ COPY ["src", "/app/rookeries/src/"]
COPY ["template", "/app/rookeries/template/"] COPY ["template", "/app/rookeries/template/"]
COPY ["web-app/", "/app/rookeries/web-app/"] COPY ["web-app/", "/app/rookeries/web-app/"]
COPY ["plugins/", "/app/rookeries/plugins/"] COPY ["plugins/", "/app/rookeries/plugins/"]
COPY [".git/", "/app/rookeries/.git/"]
RUN cargo make build-all && cargo build --release RUN cargo make build-all && cargo build --release

2
src/commands/build.rs
View File

@ -150,7 +150,7 @@ pub fn build_site(project: &Project, activate_dev_mode: bool) -> Result<(), Rook
"app": env!("CARGO_PKG_NAME").to_string(), "app": env!("CARGO_PKG_NAME").to_string(),
"gitRevision": Rookeries::git_revision(), "gitRevision": Rookeries::git_revision(),
"contentBuildId": Uuid::new_v4(), "contentBuildId": Uuid::new_v4(),
"build-time": build_timestamp, "buildTime": build_timestamp,
}); });
header_message("Creating the index page..."); header_message("Creating the index page...");