Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace organisation datalab-mi to dnum-mi #482

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Replace organisation datalab-mi to dnum-mi #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-filebeat-rootless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preprod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ 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
- name: Delete untagged images
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ 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
- name: Delete untagged images
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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DC := ${DOCKER} compose
TAG := 3.3
APP_NAME := basegun
REG := ghcr.io
ORG := datalab-mi
ORG := dnum-mi

export

Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/LegalPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
<p>
Le code source du projet est disponible publiquement à l'adresse
<a
href="https://github.com/datalab-mi/Basegun"
href="https://github.com/dnum-mi/Basegun"
target="blank"
>https://github.com/datalab-mi/Basegun</a>
>https://github.com/dnum-mi/Basegun</a>
</p>

<h2>Hébergement</h2>
Expand Down
Loading