diff --git a/.gitea/workflows/dockerfile_runner.yaml b/.gitea/workflows/dockerfile_runner.yaml index 84e65ae..6bf7614 100644 --- a/.gitea/workflows/dockerfile_runner.yaml +++ b/.gitea/workflows/dockerfile_runner.yaml @@ -15,9 +15,9 @@ jobs: env: RUNNER_TOOL_CACHE: /toolcache DEBUG: True - ALLOWED_HOSTS: "django.tryton.geeraert.eu" + ALLOWED_HOSTS: "django.geeraert.eu" container: - image: gitea.tryton.geeraert.eu/pi-ux-ce/custom-runner-debian-slim:1.0.6 + image: gitea.geeraert.eu/pi-ux-ce/custom-runner-debian-slim:1.0.6 volumes: - act-toolcache:/opt/hostedtoolcache # this is where Runner store their cache default runs-on: host-runner @@ -59,7 +59,7 @@ jobs: - name: Login to gitea uses: docker/login-action@v3 with: - registry: gitea.tryton.geeraert.eu + registry: gitea.geeraert.eu username: ${{ secrets.USERNAME_GITEA }} password: ${{ secrets.PASSWORD_GITEA }} @@ -67,16 +67,16 @@ jobs: run: | docker build \ -f infra/production/dockerfile \ - --build-arg ALLOWED_HOSTS='django.tryton.geeraert.eu' \ + --build-arg ALLOWED_HOSTS='django.geeraert.eu' \ --build-arg DEBUG='True' \ - -t gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest \ - -t gitea.tryton.geeraert.eu/pi-ux-ce/django-python:${{ env.next_version }} \ + -t gitea.geeraert.eu/pi-ux-ce/django-python:latest \ + -t gitea.geeraert.eu/pi-ux-ce/django-python:${{ env.next_version }} \ . - name: Push image run: | - docker push gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest - docker push gitea.tryton.geeraert.eu/pi-ux-ce/django-python:${{ env.next_version }} + docker push gitea.geeraert.eu/pi-ux-ce/django-python:latest + docker push gitea.geeraert.eu/pi-ux-ce/django-python:${{ env.next_version }} - name: Rollout Django to force pulling the new image uses: actions-hub/kubectl@master @@ -91,7 +91,7 @@ jobs: run: | curl -X PUT -H "Content-Type: application/json" \ --user ${{ secrets.USERNAME_GITEA }}:${{ secrets.PASSWORD_GITEA }} \ - https://gitea.tryton.geeraert.eu/api/v1/repos/pi-ux-ce/${{ github.event.repository.name }}/actions/variables/VERSION \ + https://gitea.geeraert.eu/api/v1/repos/pi-ux-ce/${{ github.event.repository.name }}/actions/variables/VERSION \ -d "{\"Value\":\"$next_version\"}" - name: backup git for future use diff --git a/.gitea/workflows/dockerfile_testing_runner.yaml b/.gitea/workflows/dockerfile_testing_runner.yaml index 4957bc3..ea2e3e6 100644 --- a/.gitea/workflows/dockerfile_testing_runner.yaml +++ b/.gitea/workflows/dockerfile_testing_runner.yaml @@ -36,7 +36,7 @@ jobs: - name: Login to gitea uses: docker/login-action@v3 with: - registry: gitea.tryton.geeraert.eu + registry: gitea.geeraert.eu username: ${{ secrets.USERNAME_GITEA }} password: ${{ secrets.PASSWORD_GITEA }} @@ -44,23 +44,23 @@ jobs: run: | docker build \ -f infra/testing/dockerfile \ - --build-arg ALLOWED_HOSTS='django-testing.tryton.geeraert.eu' \ + --build-arg ALLOWED_HOSTS='django-testing.geeraert.eu' \ --build-arg DEBUG='True' \ --build-arg CACHE_BUST=${{ env.next_version }} \ - -t gitea.tryton.geeraert.eu/pi-ux-ce/django-testing:latest \ - -t gitea.tryton.geeraert.eu/pi-ux-ce/django-testing:${{ env.next_version }} \ + -t gitea.geeraert.eu/pi-ux-ce/django-testing:latest \ + -t gitea.geeraert.eu/pi-ux-ce/django-testing:${{ env.next_version }} \ . - name: Push image run: | - docker push gitea.tryton.geeraert.eu/pi-ux-ce/django-testing:latest - docker push gitea.tryton.geeraert.eu/pi-ux-ce/django-testing:${{ env.next_version }} + docker push gitea.geeraert.eu/pi-ux-ce/django-testing:latest + docker push gitea.geeraert.eu/pi-ux-ce/django-testing:${{ env.next_version }} - name: update version in the variable run: | curl -X PUT -H "Content-Type: application/json" \ --user ${{ secrets.USERNAME_GITEA }}:${{ secrets.PASSWORD_GITEA }} \ - https://gitea.tryton.geeraert.eu/api/v1/repos/pi-ux-ce/${{ github.event.repository.name }}/actions/variables/VERSION_TESTING \ + https://gitea.geeraert.eu/api/v1/repos/pi-ux-ce/${{ github.event.repository.name }}/actions/variables/VERSION_TESTING \ -d "{\"Value\":\"$next_version\"}" - name: Rollout Django to force pulling the new image diff --git a/README.md b/README.md index ce385ad..67633b6 100644 --- a/README.md +++ b/README.md @@ -72,14 +72,14 @@ export bitwarden_organization_id="" ``` cd existing_repo -git remote add origin https://gitlab.tryton.geeraert.eu/pierre/django_kube.git +git remote add origin https://gitea.geeraert.eu/pi-ux-ce/Django_kube.git git branch -M main git push -uf origin main ``` ## Integrate with your tools -- [ ] [Set up project integrations](https://gitlab.tryton.geeraert.eu/pierre/django_kube/-/settings/integrations) +- [ ] [Set up project integrations](https://gitlab.geeraert.eu/pierre/django_kube/-/settings/integrations) ## Collaborate with your team diff --git a/django_code/apps/bitwarden/utils.py b/django_code/apps/bitwarden/utils.py index ec89fb8..9e713c8 100644 --- a/django_code/apps/bitwarden/utils.py +++ b/django_code/apps/bitwarden/utils.py @@ -12,9 +12,9 @@ class bitwardenUtils(): client = BitwardenClient( client_settings_from_dict( { - "apiUrl": os.getenv("API_URL", "https://bitwarden.tryton.geeraert.eu/api"), + "apiUrl": os.getenv("API_URL", "https://bitwarden.geeraert.eu/api"), "deviceType": DeviceType.SDK, - "identityUrl": os.getenv("IDENTITY_URL", "https://bitwarden.tryton.geeraert.eu/identity"), + "identityUrl": os.getenv("IDENTITY_URL", "https://bitwarden.geeraert.eu/identity"), "userAgent": "Python", } ) diff --git a/django_code/apps/kubernetes_connection/apps.py b/django_code/apps/kubernetes_connection/apps.py index e288fb0..07d59e8 100644 --- a/django_code/apps/kubernetes_connection/apps.py +++ b/django_code/apps/kubernetes_connection/apps.py @@ -62,7 +62,7 @@ def nodes(request): 'spec': { 'containers': [{ - 'image': 'gitea.tryton.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', + 'image': 'gitea.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', # 'pod-running-timeout': '5m0s', 'name': 'testpython', 'env': [ @@ -96,7 +96,7 @@ def backup_job(request): 'spec': { 'containers': [{ - 'image': 'gitea.tryton.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', + 'image': 'gitea.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', 'name': 'testpython', 'command': ['/bin/sh -c /config/export_bitwarden.sh'], 'env': [ @@ -124,8 +124,8 @@ def backup_job_yaml(request,sync_target): v1 = client.BatchV1Api() yaml_location = { - "synology" : "https://gitea.tryton.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/synology_pod.yaml", - "openmediavault":"https://gitea.tryton.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/openmediavault_pod.yaml" + "synology" : "https://gitea.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/synology_pod.yaml", + "openmediavault":"https://gitea.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/openmediavault_pod.yaml" } print(yaml_location[sync_target]) url_to_select=yaml_location[sync_target] diff --git a/infra/production/dockerfile b/infra/production/dockerfile index 260f8d7..9c4bdf6 100644 --- a/infra/production/dockerfile +++ b/infra/production/dockerfile @@ -1,7 +1,7 @@ FROM python:3.12 ENV PYTHONUNBUFFERED 1 -#ENV ALLOWED_HOSTS 'django.tryton.geeraert.eu' +#ENV ALLOWED_HOSTS 'django.geeraert.eu' #ENV DEBUG 'True' ARG ALLOWED_HOSTS diff --git a/infra/testing/dockerfile b/infra/testing/dockerfile index 6746664..9745d89 100644 --- a/infra/testing/dockerfile +++ b/infra/testing/dockerfile @@ -4,7 +4,7 @@ FROM python:3.12 MAINTAINER pi-ux-ce ENV PYTHONUNBUFFERED 1 -ENV ALLOWED_HOSTS 'django-testing.tryton.geeraert.eu' +ENV ALLOWED_HOSTS 'django-testing.geeraert.eu' ENV DEBUG 'True' WORKDIR /code/ @@ -20,7 +20,7 @@ RUN apt-get update && \ # image silently keeps stale code. ARG CACHE_BUST=1 RUN echo "cache bust: ${CACHE_BUST}" && \ - git clone --depth 1 -b testing https://gitea.tryton.geeraert.eu/pi-ux-ce/Django_kube.git . + git clone --depth 1 -b testing https://gitea.geeraert.eu/pi-ux-ce/Django_kube.git . RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade pip RUN pip list --cache-dir=/opt/hostedtoolcache/pip --outdated