diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index fa1cca5..aeb208f 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -38,7 +38,7 @@ jobs: if: github.event_name != 'pull_request' uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1 with: - cosign-release: 'v2.1.1' + cosign-release: 'v2.2.2' # Set up BuildKit Docker container builder to be able to build # multi-platform images and export cache diff --git a/Dockerfile b/Dockerfile index c7ae82b..5525878 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \ WORKDIR /usr/src/app -COPY koalixcrm /usr/src/app/koalixcrm +COPY koalixcrm-prod /usr/src/app/koalixcrm-prod # Install dependencies RUN pip install --upgrade pip @@ -35,4 +35,4 @@ ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64 EXPOSE 8000 # Command to run the Django development server -CMD python manage.py koalixcrm/migrate && gunicorn --bind :8000 wsgi \ No newline at end of file +CMD python koalixcrm-prod/manage.py migrate && gunicorn --bind :8000 koalixcrm-prod.settings.wsgi \ No newline at end of file diff --git a/koalixcrm/__init__.py b/koalixcrm-prod/__init__.py similarity index 100% rename from koalixcrm/__init__.py rename to koalixcrm-prod/__init__.py diff --git a/koalixcrm/manage.py b/koalixcrm-prod/manage.py similarity index 100% rename from koalixcrm/manage.py rename to koalixcrm-prod/manage.py diff --git a/koalixcrm/settings/__init__.py b/koalixcrm-prod/settings/__init__.py similarity index 100% rename from koalixcrm/settings/__init__.py rename to koalixcrm-prod/settings/__init__.py diff --git a/koalixcrm/settings/base_settings.py b/koalixcrm-prod/settings/base_settings.py similarity index 100% rename from koalixcrm/settings/base_settings.py rename to koalixcrm-prod/settings/base_settings.py diff --git a/koalixcrm/settings/dashboard.py b/koalixcrm-prod/settings/dashboard.py similarity index 100% rename from koalixcrm/settings/dashboard.py rename to koalixcrm-prod/settings/dashboard.py diff --git a/koalixcrm/settings/production_docker_postgres_settings.py b/koalixcrm-prod/settings/production_docker_postgres_settings.py similarity index 100% rename from koalixcrm/settings/production_docker_postgres_settings.py rename to koalixcrm-prod/settings/production_docker_postgres_settings.py diff --git a/koalixcrm/settings/urls.py b/koalixcrm-prod/settings/urls.py similarity index 98% rename from koalixcrm/settings/urls.py rename to koalixcrm-prod/settings/urls.py index d81637d..022329a 100644 --- a/koalixcrm/settings/urls.py +++ b/koalixcrm-prod/settings/urls.py @@ -14,21 +14,20 @@ 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.urls import path +from django.conf.urls import include from django.conf.urls.static import * -from django.contrib.staticfiles.urls import static from django.contrib import admin +from django.contrib.staticfiles.urls import static from django.shortcuts import redirect -from django.conf.urls import include, url +from django.urls import path from filebrowser.sites import site -from rest_framework import routers - from koalixcrm.accounting.rest.restinterface import AccountAsJSON, AccountingPeriodAsJSON, BookingAsJSON, \ ProductCategoryAsJSON from koalixcrm.crm.rest.restinterface import ContractAsJSON, CurrencyAsJSON, ProductAsJSON, ProjectAsJSON, TaskAsJSON, \ TaskStatusAsJSON, TaxAsJSON, UnitAsJSON, CustomerGroupAsJSON, CustomerBillingCycleAsJSON, \ CustomerAsJSON, ContactPostalAddressAsJSON, ContactEmailAddressAsJSON, ContactPhoneAddressAsJSON, \ ProjectStatusAsJSON +from rest_framework import routers router = routers.DefaultRouter() router.register(r'accounts', AccountAsJSON) diff --git a/koalixcrm/settings/wsgi.py b/koalixcrm-prod/settings/wsgi.py similarity index 100% rename from koalixcrm/settings/wsgi.py rename to koalixcrm-prod/settings/wsgi.py