From d19ec4491973c87510444e32e98e8c5cf83ee2a8 Mon Sep 17 00:00:00 2001 From: kusz Date: Wed, 27 Nov 2024 13:56:20 +0100 Subject: [PATCH] Changed url's for prodat.outbo.pl & removed sentry url's --- .DS_Store | Bin 6148 -> 6148 bytes .gitlab-ci.yml | 6 +-- evg-outbo-api/.DS_Store | Bin 6148 -> 6148 bytes .../outbo/apps/products/models/product.py | 42 +++++++++--------- .../outbo/apps/products/serializers/brief.py | 2 +- .../outbo/apps/projects/models/project.py | 2 +- evg-outbo-web/src/API/axiosConfig.ts | 3 +- evg-outbo-web/src/index.tsx | 4 +- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.DS_Store b/.DS_Store index 0adb61a6cecb02cdc6e052a21bcbe8450f0fa1a1..c2e6c3a4d894db6f1c98e57e24f97e2a78e55ec1 100644 GIT binary patch delta 318 zcmZoMXfc=|#>B!ku~2NHo}wT>0|Nsi1A_oVN^x>dQht8U=84R!nd?EqEDU-K=?s|+ zB`_(V7(y^7-7q*gKeqrR$e_>9hb)(y@8Xh_lb-|>A@sgPMPfMIeRGeQxVH~AG%k=A99#AFF(9`?dY zbJGRY$0o-z%TM+~;p;Lw06o5taWgvyKL;>$fSm8llles)Ie>w~1av#Y<_M8B%mC#L BQt$u( delta 175 zcmZoMXfc=|#>B)qF;Q%yo}wrR0|Nsi1A_nqLq0<(LkU9?kk;LpxSWxZWAXtO9VWfa zlNDGMCiAi8GYL3Mu4k1O$VoR0PR`FQ0BU4lFlCxQxq($qI5*$LB`GIA2`B_Kv0>KJ zqemtOvPw->U=w6V<{w~XogB`_$0)E_kVA}RVnNzwb`E|HpmTuy@640=MI1p60=bA~ JbA-qmW&moSDue(4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3daeebb..2703f8b 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ build-web-release: variables: DOCKER_DRIVER: "overlay2" - OUTBO_BACKEND_URL: "https://outbo-api.stage.ermlab.com" + OUTBO_BACKEND_URL: "https://prodatapi.outbo.pl" services: - docker:dind @@ -23,7 +23,7 @@ build-web-release: script: - docker pull ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} || true - docker pull ${CI_REGISTRY_IMAGE}/web:latest || true - - docker build -f web.Dockerfile --build-arg outbo_env=staging --build-arg backend_url=https://outbo-api.stage.ermlab.com/ --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web + - docker build -f web.Dockerfile --build-arg outbo_env=staging --build-arg backend_url=https://prodatapi.outbo.pl --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web - docker push ${CI_REGISTRY_IMAGE}/web:latest - docker push ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} @@ -50,7 +50,7 @@ build-web-master: script: - docker pull ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} || true - docker pull ${CI_REGISTRY_IMAGE}/web:latest || true - - docker build --build-arg outbo_env=production --build-arg backend_url=https://api.outbo.pl/ -f web.Dockerfile --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web + - docker build --build-arg outbo_env=production --build-arg backend_url=https://prodatapi.outbo.pl -f web.Dockerfile --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web - docker push ${CI_REGISTRY_IMAGE}/web:latest - docker push ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} diff --git a/evg-outbo-api/.DS_Store b/evg-outbo-api/.DS_Store index e6dee25441ed91adfb71dc72f13ac537c38a5523..753214dcbb9abb9ff70aa4878a71f349a49c8114 100644 GIT binary patch delta 142 zcmZoMXfc@JFT%;dz`)4BAi%(opHiHhla!yI!?; z4AZ-?$y!WO?33pBq%WyHHrbm=8qUrIO7k&H?q-r@>e@be6;RcFFNmtsKvgjITP9h? P1fWGvSvIqC{N)D#)mkhI delta 254 zcmZoMXfc@JFU-Nfz`)4BAi%(opObDFoSdIqu-TA#C8In@f|Vhkp_HM7AqgP~6a|Xg z&YbMXB$dX%&@k)i(IbwiN^|p5T#|C~lYpW?L$IkR$bi@cGK+y1XgA2J5{6WUVjx)z sa|cM6fuU&g