diff --git a/docker/backend/.dockerignore b/docker/backend/.dockerignore new file mode 100644 index 0000000000..54b5610c78 --- /dev/null +++ b/docker/backend/.dockerignore @@ -0,0 +1,8 @@ +*.log +*.pyc +__pycache__/ +.env +.git +node_modules/ +dist/ +venv/ \ No newline at end of file diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 84372fe1a2..c82df087b8 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -81,8 +81,11 @@ RUN GECKODRIVER_VERSION=$(curl -s https://api.github.com/repos/mozilla/geckodriv COPY --from=builder /opt/venv /opt/venv COPY --from=builder /augur /augur -# Ensure correct permissions and set entrypoint +# Execute the install-workers-deps.sh script here RUN chmod +x /augur/scripts/docker/install-workers-deps.sh /augur/scripts/docker/install-go.sh +RUN ./augur/scripts/docker/install-workers-deps.sh +RUN ./augur/scripts/docker/install-go.sh + RUN mkdir -p /augur/facade/ repos/ logs/ COPY ./docker/backend/entrypoint.sh / diff --git a/docker/backend/init.sh b/docker/backend/init.sh index 7d636873c8..d867e3732c 100644 --- a/docker/backend/init.sh +++ b/docker/backend/init.sh @@ -8,7 +8,7 @@ fi if [ ! -v AUGUR_NO_CONFIG ]; then - ./scripts/install/config.sh docker + ./augur/scripts/install/config.sh docker fi if [[ -f /repo_groups.csv ]]; then diff --git a/environment.txt b/environment.txt index 7c9ebfa380..89dd2220e4 100644 --- a/environment.txt +++ b/environment.txt @@ -1,5 +1,5 @@ AUGUR_GITHUB_API_KEY= -AUGUR_GITHUB_USERNAME= +AUGUR_GITHUB_USERNAME=Mbaoma AUGUR_GITLAB_API_KEY= AUGUR_GITLAB_USERNAME= AUGUR_DB= diff --git a/scripts/docker/install-workers-deps.sh b/scripts/docker/install-workers-deps.sh index 90d4d44e0e..d1f3a93470 100755 --- a/scripts/docker/install-workers-deps.sh +++ b/scripts/docker/install-workers-deps.sh @@ -13,4 +13,4 @@ done # taken from ./scripts/install/nltk_dictionaries.sh for i in stopwords punkt popular universal_tagset ; do /opt/venv/bin/python -m nltk.downloader $i -done +done \ No newline at end of file