From b04ee3a60a9f6e449568d16106c85350504692f9 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Mon, 28 Sep 2020 14:58:23 -0700
Subject: [PATCH] Update rust to 1.46

Should add support for TLS 1.3

Also, this fixes the Alpine builds
---
 Dockerfile         |  2 +-
 Dockerfile.alpine  | 17 ++++++++---------
 Makefile           |  4 ++++
 docker-compose.yml |  5 +++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9e14ab4..f6ef85e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.33
+FROM rust:1.46
 
 WORKDIR /usr/src/
 RUN USER=root cargo new --bin bitwarden_rs_ldap
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 3ec1749..098182e 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,18 +1,17 @@
-FROM ekidd/rust-musl-builder:1.33.0 AS builder
+FROM ekidd/rust-musl-builder:1.46.0 AS builder
 
+# Cache build deps
 RUN USER=rust cargo init
-
-COPY ./Cargo.toml ./Cargo.toml
-COPY ./Cargo.lock ./Cargo.lock
-RUN cargo build --release
+COPY Cargo.toml Cargo.lock ./
+RUN cargo build --locked --release
 
 # Remove temp src
 RUN rm src/*.rs
-COPY ./src ./src
-# Fix permissions on source
-RUN USER=root chown -R rust:rust /home/rust/src/src
-
+# Remove bins to make sure we rebuild
+# RUN rm ./target/release/deps/bitwarden_rs_ldap*
+COPY --chown=rust:rust ./src ./src
 RUN touch ./src/main.rs
+
 RUN cargo build --release
 
 FROM alpine:3
diff --git a/Makefile b/Makefile
index b00c445..99ba5e7 100644
--- a/Makefile
+++ b/Makefile
@@ -52,3 +52,7 @@ clean:
 .PHONY: docker-build
 docker-build:
 	docker build -f ./Dockerfile -t $(DOCKER_TAG) .
+
+.PHONY: docker-build-alpine
+docker-build-alpine:
+	docker build -f ./Dockerfile.alpine -t $(DOCKER_TAG):alpine .
diff --git a/docker-compose.yml b/docker-compose.yml
index e6909a8..3e0b2b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,11 +4,12 @@ services:
   ldap_sync:
     build:
       context: .
-      # dockerfile: Dockerfile.alpine
+      dockerfile: Dockerfile.alpine
     volumes:
-      - ./example.config.toml:/usr/src/bitwarden_rs_ldap/config.toml:ro
+      - ./example.config.toml:/config.toml:ro
       # ./root.cert:/usr/src/bitwarden_rs_ldap/root.cert:ro
     environment:
+      CONFIG_PATH: /config.toml
       RUST_BACKTRACE: 1
     restart: always