Commit 5d172a1f authored by Andrea Giannetti's avatar Andrea Giannetti
Browse files

Revise Dockerfile so that radmc is not installed under /root.

parent 60807a5a

.dockerignore

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
/etl/prs/fits/cubes/*

/etl/prs/fits/moments/*

/etl/prs/fits/ratios/*

/etl/prs/fits/grids/*

/etl/mdl/radmc_files/*
 
 No newline at end of file

Dockerfile

+7 −9
Original line number Diff line number Diff line
@@ -16,19 +16,17 @@ RUN python -m pip install --upgrade pip 
COPY etl/requirements.txt .

RUN pip install -r requirements.txt



RUN mkdir /pippo

# RUN /usr/sbin/usermod -d /pippo root

RUN HOME=/pippo

COPY documentation/radmc3d_install.sh .

RUN chmod 755 radmc3d_install.sh

RUN ./radmc3d_install.sh

ENV PATH="/root/bin:${PATH}"

ENV PYTHONPATH="/root/bin/python:${PYTHONPATH}"

RUN HOME=/pippo;./radmc3d_install.sh

ENV PATH="/pippo/bin:${PATH}"

ENV PYTHONPATH="/pippo/bin/python:${PYTHONPATH}"

RUN chmod 755 /pippo/bin/radmc3d



# STEP 2) Bundling app

COPY etl .

RUN mkdir -p stg/archive

RUN mkdir -p mdl/scratches

RUN mkdir -p prs/fits/cubes

RUN mkdir -p prs/fits/moments

RUN mkdir -p prs/fits/ratios

RUN mkdir -p prs/output



CMD python main.py
 
 No newline at end of file

etl/main.py

+2 −1
Original line number Diff line number Diff line 
import glob

import os

import uuid

import stg.stg_build_db_structure

from itertools import product, chain

from multiprocessing import Pool

from assets.commons import (load_config_file,
@@ -32,7 +33,7 @@ def compute_grid(tdust, nh2, line, density_keyword, dust_temperature_keyword): 
            }

        }

    }

    cube_fits_name = execute_radmc_script(grid_tarfile=tarname,

    cube_fits_name = execute_radmc_script(grid_zipfile=tarname,

                                          override_config=mdl_overrides,

                                          radmc_input_path=scratch_dir,

                                          run_id=run_id)