summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-03-18 22:30:16 -0400
committerDessalines <tyhou13@gmx.com>2020-03-18 22:30:16 -0400
commitdc14719b08a431b7cdc19de4cc6fd93b3a9da5f6 (patch)
treeae9595b03c2f4525c38a667fa285ef7ed82b1201 /docker
parent231f7822609b3c8be8c78b7bad917ab88bafcb13 (diff)
Updating rust, rust deps, yarn deps. Fixes #605
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/Dockerfile4
-rw-r--r--docker/dev/Dockerfile.libc4
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index aa0c2a8e..d9ffc2f3 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -10,7 +10,7 @@ RUN yarn install --pure-lockfile
COPY ui /app/ui
RUN yarn build
-FROM ekidd/rust-musl-builder:1.40.0-openssl11 as rust
+FROM ekidd/rust-musl-builder:1.42.0-openssl11 as rust
# Cache deps
WORKDIR /app
@@ -33,7 +33,7 @@ RUN cargo build --frozen --release
# RUN cargo install diesel_cli --no-default-features --features postgres
-FROM ekidd/rust-musl-builder:1.40.0-openssl11 as docs
+FROM ekidd/rust-musl-builder:1.42.0-openssl11 as docs
WORKDIR /app
COPY docs ./docs
RUN sudo chown -R rust:rust .
diff --git a/docker/dev/Dockerfile.libc b/docker/dev/Dockerfile.libc
index 5eec3895..6348342f 100644
--- a/docker/dev/Dockerfile.libc
+++ b/docker/dev/Dockerfile.libc
@@ -20,7 +20,7 @@ COPY ui /app/ui
RUN yarn build
-FROM rust:1.40 as rust
+FROM rust:1.42 as rust
# Cache deps
WORKDIR /app
@@ -53,7 +53,7 @@ RUN cp /app/server/target/release/lemmy_server /app/server/ready
#RUN cp /app/server/target/debug/lemmy_server /app/server/ready
-FROM rust:1.40 as docs
+FROM rust:1.42 as docs
WORKDIR /app