diff --git a/backend/Dockerfile.pe b/backend/Dockerfile.pe index eef90641..e0767353 100644 --- a/backend/Dockerfile.pe +++ b/backend/Dockerfile.pe @@ -26,9 +26,9 @@ RUN ./aws/install # Install pe-source module # Sync the latest from cf-staging branch -RUN git clone -b AL-staging-SQS https://github.com/cisagov/pe-reports.git && \ - cd pe-reports && \ - git checkout 6405a2041656152b176b5fc9b3becb5dc11a5f3e && \ +RUN git clone -b crossfeed-SQS https://github.com/cisagov/ATC-Framework.git && \ + cd ATC-Framework && \ + git checkout a4036e94ad54876cb592fc966f57e7fd84750e9a && \ pip install . RUN python -m spacy download en_core_web_lg diff --git a/backend/Dockerfile.worker b/backend/Dockerfile.worker index ea688f90..4ef4f5ad 100644 --- a/backend/Dockerfile.worker +++ b/backend/Dockerfile.worker @@ -58,9 +58,6 @@ RUN pip3.10 install --upgrade pip RUN apt remove dav1d && apt autoclean && apt autoremove -# Install pe-source module -# Sync the latest from cf-staging branch -RUN git clone -b cf-source-staging https://github.com/cisagov/pe-reports.git && cd pe-reports && git checkout c9cbbd73b22ef38cabe1da6ba50aeb2dc0be4f99 && sed -i 's/"pandas == 1.1.5"/"pandas == 1.5.1"/g' setup.py && sed -i 's/psycopg2-binary == 2.9.3/psycopg2-binary == 2.9.5/g' setup.py && sed -i 's/psycopg2-binary == 2.9.3/psycopg2-binary == 2.9.5/g' setup_reports.py && pip install . # Python dependencies COPY worker/requirements.txt worker/requirements.txt diff --git a/backend/worker/generate_config.sh b/backend/worker/generate_config.sh index 6a461dbe..85acda82 100755 --- a/backend/worker/generate_config.sh +++ b/backend/worker/generate_config.sh @@ -1,7 +1,7 @@ #!/bin/bash # Generate database.ini -cat << EOF > pe-reports/src/pe_reports/data/database.ini +cat << EOF > ATC-Framework/src/pe_reports/data/database.ini [postgres] host=${DB_HOST} database=${PE_DB_NAME} @@ -52,6 +52,6 @@ pe_reports_path=$(pip show pe-reports | grep -E '^Location:' | awk '{print $2}') pe_reports_path="${pe_reports_path%/pe-reports}/pe_reports" # Copy database.ini to the module's installation directory -cp /app/pe-reports/src/pe_reports/data/database.ini "${pe_reports_path}/data/" +cp /app/ATC-Framework/src/pe_reports/data/database.ini "${pe_reports_path}/data/" exec "$@"