Skip to content
Snippets Groups Projects
Commit caaf0940 authored by James Kennington's avatar James Kennington
Browse files

Fix docker conda env with linux lock

parent 4972a321
No related branches found
No related tags found
1 merge request!60Fix docker conda env with linux lock
Pipeline #265471 passed
...@@ -18,57 +18,57 @@ COPY gstlal-ugly /gstlal-ugly ...@@ -18,57 +18,57 @@ COPY gstlal-ugly /gstlal-ugly
COPY gstlal-inspiral /gstlal-inspiral COPY gstlal-inspiral /gstlal-inspiral
COPY gstlal-burst /gstlal-burst COPY gstlal-burst /gstlal-burst
# Switch to bash shell # Make RUN commands use bash:
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
# Install gstlal # Install gstlal
RUN . /opt/conda/etc/profile.d/conda.sh && \ RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
conda activate base && \ conda activate build-env && \
export PREFIX="/opt/conda" && \ export PREFIX="$CONDA_PREFIX" && \
export CONDA_BUILD="1" && \ export CONDA_BUILD="1" && \
conda activate base && \ conda activate build-env && \
cd /gstlal && \ cd /gstlal && \
./00init.sh && \ ./00init.sh && \
./configure --prefix=/opt/conda --without-doxygen && \ ./configure --prefix=$CONDA_PREFIX --without-doxygen && \
make -j$NUM_CORES && \ make -j$NUM_CORES && \
make install -j$NUM_CORES make install -j$NUM_CORES
RUN rm -rf gstlal RUN rm -rf gstlal
# Install gstlal-ugly # Install gstlal-ugly
RUN . /opt/conda/etc/profile.d/conda.sh && \ RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
conda activate base && \ conda activate build-env && \
export PREFIX="/opt/conda" && \ export PREFIX="$CONDA_PREFIX" && \
export CONDA_BUILD="1" && \ export CONDA_BUILD="1" && \
conda activate base && \ conda activate build-env && \
cd /gstlal-ugly && \ cd /gstlal-ugly && \
./00init.sh && \ ./00init.sh && \
./configure --prefix=/opt/conda --without-doxygen --without-gds && \ ./configure --prefix=$CONDA_PREFIX --without-doxygen --without-gds && \
make -j$NUM_CORES && \ make -j$NUM_CORES && \
make install -j$NUM_CORES make install -j$NUM_CORES
RUN rm -rf gstlal-ugly RUN rm -rf gstlal-ugly
# Install gstlal-burst # Install gstlal-burst
RUN . /opt/conda/etc/profile.d/conda.sh && \ RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
conda activate base && \ conda activate build-env && \
export PREFIX="/opt/conda" && \ export PREFIX="$CONDA_PREFIX" && \
export CONDA_BUILD="1" && \ export CONDA_BUILD="1" && \
conda activate base && \ conda activate build-env && \
cd /gstlal-burst && \ cd /gstlal-burst && \
./00init.sh && \ ./00init.sh && \
./configure --prefix=/opt/conda --without-doxygen && \ ./configure --prefix=$CONDA_PREFIX --without-doxygen && \
make -j$NUM_CORES && \ make -j$NUM_CORES && \
make install -j$NUM_CORES make install -j$NUM_CORES
RUN rm -rf gstlal-burst RUN rm -rf gstlal-burst
# Install gstlal-inspiral # Install gstlal-inspiral
RUN . /opt/conda/etc/profile.d/conda.sh && \ RUN . $CONDA_PREFIX/etc/profile.d/conda.sh && \
conda activate base && \ conda activate build-env && \
export PREFIX="/opt/conda" && \ export PREFIX="$CONDA_PREFIX" && \
export CONDA_BUILD="1" && \ export CONDA_BUILD="1" && \
conda activate base && \ conda activate build-env && \
cd /gstlal-inspiral && \ cd /gstlal-inspiral && \
./00init.sh && \ ./00init.sh && \
./configure --prefix=/opt/conda --without-doxygen --disable-massmodel && \ ./configure --prefix=$CONDA_PREFIX --without-doxygen --disable-massmodel && \
make -j$NUM_CORES && \ make -j$NUM_CORES && \
make install -j$NUM_CORES make install -j$NUM_CORES
RUN rm -rf gstlal-inspiral RUN rm -rf gstlal-inspiral
...@@ -80,11 +80,11 @@ ARG CI_COMMIT_REF_NAME ...@@ -80,11 +80,11 @@ ARG CI_COMMIT_REF_NAME
FROM $CI_REGISTRY_IMAGE/dependencies/conda:$CI_COMMIT_REF_NAME AS run FROM $CI_REGISTRY_IMAGE/dependencies/conda:$CI_COMMIT_REF_NAME AS run
# Copy build artifacts # Copy build artifacts
COPY --from=build /opt/conda /opt/conda COPY --from=build $CONDA_PREFIX $CONDA_PREFIX
# Export environment variables: # Export environment variables:
ENV PKG_CONFIG_PATH /opt/conda/lib/pkgconfig ENV PKG_CONFIG_PATH $CONDA_PREFIX/lib/pkgconfig
ENV GST_PLUGIN_PATH /opt/conda/lib/gstreamer-1.0 ENV GST_PLUGIN_PATH $CONDA_PREFIX/lib/gstreamer-1.0
ENV GSTLAL_FIR_WHITEN 0 ENV GSTLAL_FIR_WHITEN 0
ENV TMPDIR /tmp ENV TMPDIR /tmp
......
...@@ -60,18 +60,17 @@ stages: ...@@ -60,18 +60,17 @@ stages:
- | - |
cat <<EOF > Dockerfile cat <<EOF > Dockerfile
FROM igwn/base:conda FROM igwn/base:conda
COPY gstlal-inspiral/share/conda/dev-environment.yml . COPY gstlal/share/conda/envs/qualified-linux-64.lock .
SHELL ["/bin/bash", "-c"]
RUN conda config --set always_yes yes RUN conda config --set always_yes yes
RUN conda config --add channels conda-forge RUN conda config --add channels conda-forge
RUN conda update -n base conda && \ RUN conda update -n base conda && \
conda clean -af conda clean -af
RUN conda env update -n base -f dev-environment.yml && \ RUN conda create -n build-env --file qualified-linux-64.lock --force && \
conda clean -af conda clean -af
RUN conda install vim wget curl && \ RUN rm -f qualified-linux-64.lock
conda clean -af ENV PKG_CONFIG_PATH $CONDA_PREFIX/lib/pkgconfig
RUN rm -f dev-environment.yml ENV GST_PLUGIN_PATH $CONDA_PREFIX/lib/gstreamer-1.0
ENV PKG_CONFIG_PATH /opt/conda/lib/pkgconfig
ENV GST_PLUGIN_PATH /opt/conda/lib/gstreamer-1.0
ENTRYPOINT bash ENTRYPOINT bash
EOF EOF
- docker build -t $IMAGE_TAG . - docker build -t $IMAGE_TAG .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment