diff --git a/.github/workflows/build-filebeat-rootless.yml b/.github/workflows/build-filebeat-rootless.yml index 414ee2ce..57940768 100644 --- a/.github/workflows/build-filebeat-rootless.yml +++ b/.github/workflows/build-filebeat-rootless.yml @@ -22,4 +22,4 @@ jobs: with: file: ./infra/filebeat.Dockerfile push: true - tags: ghcr.io/datalab-mi/basegun/filebeat-rootless:6.5.4 + tags: ghcr.io/dnum-mi/basegun/filebeat-rootless:6.5.4 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a26623c6..d9cd2777 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: with: context: ./backend push: true - tags: ghcr.io/datalab-mi/basegun/basegun-backend:${{ github.head_ref }} + tags: ghcr.io/dnum-mi/basegun/basegun-backend:${{ github.head_ref }} build-frontend: name: Build Frontend @@ -53,14 +53,14 @@ jobs: with: context: ./frontend push: true - tags: ghcr.io/datalab-mi/basegun/basegun-frontend:${{ github.head_ref }} + tags: ghcr.io/dnum-mi/basegun/basegun-frontend:${{ github.head_ref }} test-backend: name: Test Backend needs: build-backend runs-on: ubuntu-latest container: - image: ghcr.io/datalab-mi/basegun/basegun-backend:${{ github.head_ref }} + image: ghcr.io/dnum-mi/basegun/basegun-backend:${{ github.head_ref }} env: AWS_REGION: gra AWS_DEFAULT_REGION: gra diff --git a/.github/workflows/preprod.yml b/.github/workflows/preprod.yml index de1da6fa..2d14c7c6 100644 --- a/.github/workflows/preprod.yml +++ b/.github/workflows/preprod.yml @@ -28,7 +28,7 @@ jobs: uses: vlaurin/action-ghcr-prune@main with: token: ${{ secrets.PERSO_ACCESS_TOKEN }} - organization: datalab-mi + organization: dnum-mi container: basegun/basegun-backend dry-run: false prune-untagged: true @@ -36,7 +36,7 @@ jobs: uses: vlaurin/action-ghcr-prune@main with: token: ${{ secrets.PERSO_ACCESS_TOKEN }} - organization: datalab-mi + organization: dnum-mi container: basegun/basegun-frontend dry-run: false prune-untagged: true diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 51521ceb..a3c2b22b 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -47,7 +47,7 @@ jobs: uses: vlaurin/action-ghcr-prune@main with: token: ${{ secrets.PERSO_ACCESS_TOKEN }} - organization: datalab-mi + organization: dnum-mi container: basegun/basegun-backend dry-run: false untagged: true @@ -55,7 +55,7 @@ jobs: uses: vlaurin/action-ghcr-prune@main with: token: ${{ secrets.PERSO_ACCESS_TOKEN }} - organization: datalab-mi + organization: dnum-mi container: basegun/basegun-frontend dry-run: false untagged: true diff --git a/Makefile b/Makefile index 43098b04..218f1718 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DC := ${DOCKER} compose TAG := 3.3 APP_NAME := basegun REG := ghcr.io -ORG := datalab-mi +ORG := dnum-mi export @@ -54,9 +54,9 @@ pull-%: push: push-${TAG} push-%: - docker tag basegun-frontend:${TAG}-prod ghcr.io/datalab-mi/basegun/basegun-frontend:$* - docker tag basegun-backend:${TAG}-prod ghcr.io/datalab-mi/basegun/basegun-backend:$* - docker push ghcr.io/datalab-mi/basegun/basegun-frontend:$* - docker push ghcr.io/datalab-mi/basegun/basegun-backend:$* + docker tag basegun-frontend:${TAG}-prod ghcr.io/dnum-mi/basegun/basegun-frontend:$* + docker tag basegun-backend:${TAG}-prod ghcr.io/dnum-mi/basegun/basegun-backend:$* + docker push ghcr.io/dnum-mi/basegun/basegun-frontend:$* + docker push ghcr.io/dnum-mi/basegun/basegun-backend:$* deploy-prod: pull up-prod diff --git a/README.md b/README.md index 9b3a4ec0..50c69fb5 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Dependancies: * docker * docker-compose -See also [Debugging](https://github.com/datalab-mi/Basegun/blob/develop/backend/README.md#debugging) section for all the env variables needed for the website to work fully operationally. +See also [Debugging](https://github.com/dnum-mi/Basegun/blob/develop/backend/README.md#debugging) section for all the env variables needed for the website to work fully operationally. ### Install ```bash @@ -52,15 +52,15 @@ Try to find error log * In terminal, run `docker logs basegun-backend` * If you cannot access terminal or don't see anything, go to `localhost:5000/logs` or `preprod.basegun.fr/logs` to see latest logs. -=> ErrorPage "missing model": Download model from the url specified in the [backend Dockerfile](https://github.com/datalab-mi/Basegun/blob/develop/backend/Dockerfile). +=> ErrorPage "missing model": Download model from the url specified in the [backend Dockerfile](https://github.com/dnum-mi/Basegun/blob/develop/backend/Dockerfile). ### The website runs the analysis, but no image shows up Use browser html inspector to find the url given in the image src. * If it starts with `https://storage.gra.cloud.ovh.net` then the website tried to upload the input image to OVH but it failed. Have you set properly in your env the variables OS_USERNAME, OS_PASSWORD and OS_PROJECT ? -* If it starts with `https://localhost` then the website tried to store the input image locally. Have you synchronised the mounts for frontend and backend in [docker-compose](https://github.com/datalab-mi/Basegun/blob/develop/backend/docker-compose.yml) ? (uncomment the `/tmp/basegun` lines in the volumes sections) +* If it starts with `https://localhost` then the website tried to store the input image locally. Have you synchronised the mounts for frontend and backend in [docker-compose](https://github.com/dnum-mi/Basegun/blob/develop/backend/docker-compose.yml) ? (uncomment the `/tmp/basegun` lines in the volumes sections) ### Logs are not sent to the endpoint -The variables `X_OVH_TOKEN` and `API_OVH_TOKEN` must en set in your env. See [Infra README](https://github.com/datalab-mi/Basegun/blob/develop/infra/README.md) for more details. +The variables `X_OVH_TOKEN` and `API_OVH_TOKEN` must en set in your env. See [Infra README](https://github.com/dnum-mi/Basegun/blob/develop/infra/README.md) for more details. ## Release an official version of code 1. Update tag in Makefile diff --git a/frontend/src/views/LegalPage.vue b/frontend/src/views/LegalPage.vue index 0e2f5822..288f8301 100644 --- a/frontend/src/views/LegalPage.vue +++ b/frontend/src/views/LegalPage.vue @@ -68,9 +68,9 @@
Le code source du projet est disponible publiquement à l'adresse https://github.com/datalab-mi/Basegun + >https://github.com/dnum-mi/Basegun