Merge branch '20765-moving-gvcf-regions'

[lightning.git] / docker / vcfutil / Dockerfile

diff --git a/docker/vcfutil/Dockerfile b/docker/vcfutil/Dockerfile
index 409fb8a5bce543696b0a3695a9dad4bbfcb1be41..17cab80006eadb19f36ac8f9c4521898e6359ba1 100644 (file)
--- a/docker/vcfutil/Dockerfile
+++ b/docker/vcfutil/Dockerfile
@@ -2,6 +2,13 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+<<<<<<< HEAD
+=======
+# build instruction:
+# docker build -t dockername --file=/path/to/lightning/docker/vcfutil/Dockerfile /path/to/lightning
+
+
+>>>>>>> 20765-moving-gvcf-regions
 FROM python:3.11-buster
 
 USER root
@@ -11,6 +18,9 @@ RUN apt-get update -q
 RUN apt-get install -qy build-essential wget cmake zlib1g-dev \
     libbz2-dev liblzma-dev libncurses5-dev libncursesw5-dev git vcftools
 
+# Setting up gvcf_region
+COPY ./gvcf_regions /gvcf_regions
+
 # Getting HTSLIB 1.9 for tabix/bgzip
 
 RUN wget https://github.com/samtools/htslib/releases/download/1.9/htslib-1.9.tar.bz2 && tar -xjvf htslib-1.9.tar.bz2 && \
@@ -57,9 +67,3 @@ WORKDIR /
 RUN wget https://github.com/arq5x/bedtools2/releases/download/v2.27.1/bedtools-2.27.1.tar.gz && \
     tar -xzvf bedtools-2.27.1.tar.gz && \
     cd bedtools2 && make && cp bin/* /usr/local/bin
-
-WORKDIR /
-
-# Installing gvcf_regions
-
-RUN git clone https://github.com/acoleman2000/gvcf_regions