Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
HippocampusGirl committed Apr 2, 2024
1 parent da1a3e6 commit 3f46b0c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ FROM ubuntu:rolling as base
ENV LC_ALL="C.UTF-8" \
LANG="C.UTF-8" \
DEBIAN_FRONTEND="noninteractive" \
DEBCONF_NOWARNINGS="yes" \
PATH="/opt/conda/bin:$PATH"
DEBCONF_NOWARNINGS="yes"

RUN apt-get update && \
apt-get install --yes --no-install-recommends \
Expand All @@ -25,6 +24,7 @@ RUN apt-get update && \
# =============
FROM base as conda

ENV PATH="/opt/conda/bin:$PATH"
RUN curl --silent --show-error --location \
"https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh" \
--output "conda.sh" && \
Expand All @@ -38,7 +38,6 @@ RUN curl --silent --show-error --location \
# Build packages
# ==============
FROM conda as builder

RUN mamba install --yes "boa" "conda-verify"
COPY recipes/conda_build_config.yaml /root/conda_build_config.yaml

Expand Down Expand Up @@ -112,12 +111,15 @@ RUN mamba install --yes --use-local \
"r-saige" && \
sync && \
rm -rf /opt/conda/conda-bld && \
mamba clean --yes --all --force-pkgs-dirs && \
sync && \
find /opt/conda/ -follow -type f -name "*.a" -delete && \
sync
mamba clean --yes --all --force-pkgs-dirs

# Final
# =====
FROM base
COPY --from=install /opt/conda /opt/conda

# Ensure that we can link to libraries installed via conda
ENV PATH="/opt/conda/bin:$PATH" \
CPATH="/opt/conda/include:${CPATH}"
RUN echo /opt/conda/lib > /etc/ld.so.conf.d/conda.conf && \
ldconfig
2 changes: 2 additions & 0 deletions recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ zlib:
- 1.2
pin_run_as_build:
python: x.x
gcc_version:
- 13.2.0
1 change: 0 additions & 1 deletion src/gwas/src/gwas/vcf/_read.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ struct RingBuffer {
const ssize_t bytes_read =
read(file_descriptor, data_.data() + actual_write_index, read_size);
if (bytes_read < 0) {
// std::cerr << "Error reading from file descriptor" << std::endl;
PyErr_SetString(PyExc_IOError, "Error reading from file descriptor");
throw error_already_set();
}
Expand Down

0 comments on commit 3f46b0c

Please sign in to comment.