From 02b920497ca8f10392605d9e3da675075c0236d6 Mon Sep 17 00:00:00 2001
From: Federico Terzi <federicoterzi96@gmail.com>
Date: Mon, 3 Feb 2020 18:30:58 +0100
Subject: [PATCH] Fix problem related to Debian DEB packaging in CI

---
 azure-pipelines.yml  | 6 ++----
 ci/ubuntu/Dockerfile | 9 +++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 02c7514..6752745 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -24,10 +24,8 @@ jobs:
       vmImage: 'ubuntu-latest'
     steps:
       - script: |
-          cd ci/ubuntu
-          sudo docker build -t espanso-ubuntu .
-          cd ../../
-          sudo docker run --rm -v "$(pwd):/shared" -it espanso-ubuntu ./build_deb.sh
+          sudo docker build -t espanso-ubuntu . -f ci/ubuntu/Dockerfile
+          sudo docker run --rm -v "$(pwd):/shared" -it espanso-ubuntu espanso/ci/ubuntu/build_deb.sh
         displayName: Setting up docker
       - template: ci/deploy.yml
 
diff --git a/ci/ubuntu/Dockerfile b/ci/ubuntu/Dockerfile
index ee68606..2fdb41b 100644
--- a/ci/ubuntu/Dockerfile
+++ b/ci/ubuntu/Dockerfile
@@ -30,8 +30,9 @@ RUN set -eux; \
     cargo --version; \
     rustc --version;
 
-RUN git clone https://github.com/federico-terzi/espanso.git \
-    && cd espanso \
-    && cargo install cargo-deb
+RUN mkdir espanso
 
-COPY build_deb.sh .
+COPY . espanso
+
+RUN cd espanso \
+    && cargo install cargo-deb