Merge pull request #1223 from Amsterdam/azure

Merge Azure into main

.env

@@ -1,27 +1,28 @@
 # Django environment variables
-ENVIRONMENT=development
+ENVIRONMENT=local
 DJANGO_SECRET_KEY=local
 UWSGI_HTTP=0.0.0.0:8000
 UWSGI_STATIC_MAP=/static=/static
+CORS_ORIGIN_WHITELIST=http://0.0.0.0:2999,http://localhost:2999,http://zaken-frontend.localhost,https://zaken-frontend.localhost
 DATABASE_NAME=zaken
 DATABASE_USER=zaken
 DATABASE_PASSWORD=insecure
 DATABASE_HOST=database
 DATABASE_PORT=5432
 SENTRY_DSN=https://[email protected]/0
 LOCAL_DEVELOPMENT_AUTHENTICATION=True
+LOGGING_LEVEL=DEBUG # To prevent flooding the logging in local development. Default is DEBUG.
 SECRET_KEY_TOP_ZAKEN=SECRET_KEY_TOP_ZAKEN
 SECRET_KEY_TON_ZAKEN=SECRET_KEY_TON_ZAKEN
 BELASTING_API_URL=https://api-acc.belastingen.centric.eu/bel/inn/afne/vora/v1/vorderingenidentificatienummer/
 BAG_API_SEARCH_URL=https://api.data.amsterdam.nl/atlas/search/adres/
 BAG_API_NUMMERAANDUIDING_SEARCH_URL=https://api.data.amsterdam.nl/v1/bag/nummeraanduidingen/
+BAG_API_BENKAGG_SEARCH_URL=https://api.data.amsterdam.nl/v1/benkagg/adresseerbareobjecten/
 DECOS_JOIN_USERNAME=ZakenTop
 DECOS_JOIN_PASSWORD=insecure
-RABBIT_MQ_USERNAME=rabbit_zaken_user
-RABBIT_MQ_PASSWORD=rabbit_zaken_password
-RABBIT_MQ_URL=rabbitmq
-RABBIT_MQ_PORT=5672
-REDIS=default:password@zaak-redis:6379
+REDIS_HOST=zaak-redis
+REDIS_PORT=6379
+REDIS_PASSWORD=password
 DEFAULT_THEME=Vakantieverhuur
 DEFAULT_REASON=SIA melding
 VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_URL=https://api.acceptatie.toeristischeverhuur.nl/api/
@@ -45,12 +46,8 @@ POSTGRES_DB=zaken
 POSTGRES_USER=zaken
 POSTGRES_PASSWORD=insecure
 
-# RabbitMQ service environment variables
-DEFAULT_USER=rabbit_zaken_user
-DEFAULT_PASS=rabbit_zaken_password
-
 # OpenZaak environment variables
-OPENZAAK_ENABLED=True
+OPENZAAK_ENABLED=False
 OPENZAAK_CATALOGI_URL=http://172.17.0.1:8000/catalogi/api/v1/catalogussen/c135a500-beac-4774-bc0d-b582630e605d
 OPENZAAK_DEFAULT_INFORMATIEOBJECTTYPE=http://172.17.0.1:8000/catalogi/api/v1/informatieobjecttypen/b96d14b0-03ad-421a-bc7c-b501652a04b2
 HOST=http://172.17.0.1:8080

.github/workflows/e2e-tests.yml

@@ -22,7 +22,7 @@ jobs:
 
       - run: docker network create zaken_network
       - run: docker network create top_and_zaak_backend_bridge
-      - run: docker-compose -f docker-compose.test.yml up --detach
+      - run: docker-compose -f docker-compose.local.yml up --detach
       - run: sleep 30
       - run: bash bin/setup_credentials.sh
       - run: ./e2e-tests/fix_models.sh

.github/workflows/integration-tests.yml

@@ -28,7 +28,7 @@ jobs:
       - run: docker network create top_and_zaak_backend_bridge
         working-directory: backend
 
-      - run: docker-compose up --build --detach
+      - run: docker-compose -f docker-compose.local.yml up --build --detach
         working-directory: backend
 
       ###################################################

.github/workflows/main.workflow.yml

@@ -17,12 +17,12 @@ jobs:
     - name: Linting
       run: bash bin/cleanup_pre_commit.sh
     - name: Build Docker image
-      run: docker-compose build
+      run: docker-compose build -f docker-compose.local.yml
     - name: Create Docker network
       run: docker network create zaken_network
     - name: Create TOP and Zaken Docker network
       run: docker network create top_and_zaak_backend_bridge
     - name: Start images
-      run: docker-compose up -d
+      run: docker-compose -f docker-compose.local.yml  up -d
     - name: Run Tests
       run: docker-compose exec -T zaak-gateway python manage.py test

Makefile

@@ -0,0 +1,47 @@
+.PHONY: manifests deploy
+
+dc = docker-compose
+
+ENVIRONMENT ?= local
+HELM_ARGS = manifests/chart \
+	-f manifests/values.yaml \
+	-f manifests/env/${ENVIRONMENT}.yaml \
+	--set image.tag=${VERSION}
+
+REGISTRY ?= 127.0.0.1:5001
+REPOSITORY ?= salmagundi/zaken-backend
+VERSION ?= latest
+
+build:
+	$(dc) build
+
+test:
+	echo "No tests available"
+
+migrate:
+
+push:
+	$(dc) push
+
+
+manifests:
+	@helm template wonen $(HELM_ARGS) $(ARGS)
+
+deploy: manifests
+	helm upgrade --install wonen $(HELM_ARGS) $(ARGS)
+
+update-chart:
+	rm -rf manifests/chart
+	git clone --branch 1.5.2 --depth 1 [email protected]:Amsterdam/helm-application.git manifests/chart
+	rm -rf manifests/chart/.git
+
+clean:
+	$(dc) down -v --remove-orphans
+
+reset:
+	helm uninstall wonen
+
+refresh: reset build push deploy
+
+dev:
+	nohup kubycat kubycat-config.yaml > /dev/null 2>&1&

README.md

@@ -45,13 +45,13 @@ First, make sure you have built the project and executed the database migrations
 ```
 docker network create top_and_zaak_backend_bridge
 docker network create zaken_network
-docker compose build
+docker-compose -f docker-compose.local.yml build
 ```
 
 Start AZA backend:
 
 ```
-docker compose up
+docker-compose -f docker-compose.local.yml up
 ```
 
 To create all necessary credentials run the following command:

app/Dockerfile

@@ -30,4 +30,6 @@ RUN chmod +x /app/wait-for.sh
 RUN chmod +x /app/celery.sh
 RUN chmod +x /app/deploy/docker-entrypoint.sh
 
-CMD ["bash", "/app/deploy/docker-entrypoint.sh"]
+
+ENTRYPOINT ["/app/deploy/docker-entrypoint.sh"]
+CMD ["uwsgi", "--ini", "/app/deploy/config.ini"]