From 67e007261fd0a655dcb5e3f3eca5ad47f520a727 Mon Sep 17 00:00:00 2001 From: i3rotlher Date: Wed, 20 Sep 2023 19:19:20 +0200 Subject: [PATCH] docker updated --- backend/Dockerfile | 6 ++++-- docker-compose.yml | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index f6562ff33..042ec5225 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -12,9 +12,11 @@ RUN yes | apt install ./google-chrome-stable_current_amd64.deb RUN rm -f google-chrome-stable_current_amd64.deb # install chromedriver +RUN google-chrome --version | grep -oP '\d+\.\d+\.\d+\.\d+' > chromeversion.txt RUN apt-get install -yqq unzip curl -RUN wget -O /tmp/chromedriver.zip http://chromedriver.storage.googleapis.com/$(curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE)/chromedriver_linux64.zip -RUN unzip /tmp/chromedriver.zip chromedriver -d /usr/local/bin/ +RUN wget -O /tmp/chromedriverzip.zip https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$(cat chromeversion.txt)/linux64/chromedriver-linux64.zip +RUN unzip /tmp/chromedriverzip.zip chromedriver-linux64/chromedriver -d /usr/local/bin/ +RUN mv /usr/local/bin/chromedriver-linux64/chromedriver /usr/local/bin/chromedriver # install firefox RUN wget -O ~/FirefoxSetup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64" diff --git a/docker-compose.yml b/docker-compose.yml index 5f8909519..544868b8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,21 +24,22 @@ services: - seedmongodb restart: always environment: + FRONTEND_URL: "http://localhost:4200" DATABASE_URI: mongodb://SeedAdmin:SeedTest@seedmongodb:27017 REPORT_DELETION_TIME: 5 - TESTACCOUNT_NAME: + TESTACCOUNT_NAME: TESTACCOUNT_REPO: TESTACCOUNT_TOKEN: - SESSION_SECRET: 'secretSessionKey' - JIRA_SECRET: 'secretJiraKey' - JIRA_SALT: 'BJ1yJTJ7AFql' + SESSION_SECRET: "secretSessionKey" + JIRA_SECRET: "secretJiraKey" + JIRA_SALT: "BJ1yJTJ7AFql" EMAIL_AUTH: EMAIL_PW: EMAIL_PORT: EMAIL_HOST: GITHUB_CLIENT_SECRET: GITHUB_CLIENT_ID: - PASSPORT_GITHUB_LOCAL_PW_FIELD: 'id' + PASSPORT_GITHUB_LOCAL_PW_FIELD: "id" MAX_SAVED_REPORTS: frontend: @@ -52,6 +53,7 @@ services: environment: GITHUB_CLIENT_ID: VERSION: + API_SERVER: "http://localhost:8080/api" volumes: - seedDB: \ No newline at end of file + seedDB: