Skip to content

Commit

Permalink
Fixing error?
Browse files Browse the repository at this point in the history
Found out that last error (created in dockerfile) was erroring every time. Created a version in the setup_config.sh script and have verified that it will succeed if run with enough memory. Making sure that it fails in GH actions due to low memory.
  • Loading branch information
nataliejschultz committed Jul 6, 2023
1 parent dba05cf commit d283f72
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 6 additions & 2 deletions .docker/setup_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ source setup/setup_conda.sh Linux-x86_64

echo "setup_conda.sh successful"

# now install the emission environment
source setup/setup.sh

echo "finished installing e-mission environment"
Expand All @@ -14,14 +13,19 @@ echo "finished installing e-mission environment"
## But that doesn't update all packages (e.g. cryptography=38 stays at that
## level instead of upgrading to cryptography=40)
## So we just manually upgrade the failing dependencies in the base image

# conda config --add channels conda-forge

# if [[ $(conda install -c conda-forge cryptography=40.0.2 wheel=0.40.0) == *Killed* ]]; then
# echo "!!!!! Error !!!!!"
# exit code 1
# fi
# conda install -vv -c conda-forge cryptography=40.0.2 wheel=0.40.0
conda install -c conda-forge cryptography=40.0.2 wheel=0.40.0

if [ -z "$CONDA_EXE" ]; then
echo 'Environment variable CONDA_EXE must be specified. Exiting.'
exit 1
fi

echo "finished installing conda"

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ COPY . .

RUN chmod u+x ./.docker/setup_config.sh


# # This clone puts the server code into the image, not the container

RUN bash -c "./.docker/setup_config.sh" && echo "finished setup_config.sh"

RUN if [ -z "$_CE_CONDA" ]; then echo 'Environment variable _CE_CONDA must be specified. Exiting.'; exit 1; fi
# RUN if [ -z "$_CE_CONDA" ]; then echo 'Environment variable _CE_CONDA must be specified. Exiting.'; exit 1; fi
# # #declare environment variables
# ENV DB_HOST=''
# ENV WEB_SERVER_HOST=''
Expand Down

0 comments on commit d283f72

Please sign in to comment.