Skip to content

Commit

Permalink
fix: install DCC from dev version
Browse files Browse the repository at this point in the history
  • Loading branch information
kelly-sovacool committed May 3, 2024
1 parent afb84d4 commit da7d573
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ containers:
ciri: 'docker://nciccbr/charlie_ciri2:v1'
clear: "docker://nciccbr/ccbr_clear:latest"
cutadapt: 'docker://nciccbr/charlie_cutadapt_fqfilter:v1'
dcc: "docker://nciccbr/charlie_dcc:v0.1.0"
dcc: "docker://nciccbr/charlie_dcc:v0.2.0"
fastqc: 'docker://nciccbr/ccrgb_qctools:v4.0'
mapsplice: "docker://cgrlab/mapsplice2:latest"
multiqc: 'docker://nciccbr/ccbr_multiqc_1.15:v1'
Expand Down
13 changes: 7 additions & 6 deletions docker/dcc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ ENV BUILD_TAG=${BUILD_TAG}
ARG REPONAME="000000"
ENV REPONAME=${REPONAME}

# install DCC
COPY environment.yml /data2/
ENV CONDA_ENV=dcc
RUN mamba env create -n ${CONDA_ENV} -f /data2/environment.yml && \
echo "conda activate ${CONDA_ENV}" > ~/.bashrc
ENV PATH="/opt2/conda/envs/${CONDA_ENV}/bin:$PATH"
# install DCC development version
ENV DCC_VERSION=4418a9a12a7f6e883734459f8117eba5d585b59a
WORKDIR /opt2
RUN wget https://github.com/dieterich-lab/DCC/archive/${DCC_VERSION}.zip -O dcc.zip && \
unzip dcc.zip && \
cd DCC-${DCC_VERSION} && \
python setup.py install
RUN which DCC && DCC -h

# Save Dockerfile in the docker
Expand Down
2 changes: 1 addition & 1 deletion docker/dcc/meta.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dockerhub_namespace: nciccbr
image_name: charlie_dcc
version: v0.1.0
version: v0.2.0
container: "$(dockerhub_namespace)/$(image_name):$(version)"

0 comments on commit da7d573

Please sign in to comment.