Remove arquivos desnecessários e corrige configurações

Makefile

@@ -32,71 +32,71 @@ build_date: ## Show build date
 	@echo "Build date: " $(SCMS_BUILD_DATE)
 
 ############################################
-## atalhos docker-compose desenvolvimento ##
+## atalhos docker compose desenvolvimento ##
 ############################################
 
 build:  ## Build app using $(compose)
-	@docker-compose -f $(compose) build
+	@docker compose -f $(compose) build
 
 build_no_cache:  ## Build app using $(compose)
-	@docker-compose -f $(compose) build --no-cache
+	@docker compose -f $(compose) build --no-cache
 
 up:  ## Start app using $(compose)
-	@docker-compose -f $(compose) up -d
+	@docker compose -f $(compose) up -d
 
 logs: ## See all app logs using $(compose)
-	@docker-compose -f $(compose) logs -f
+	@docker compose -f $(compose) logs -f
 
 stop:  ## Stop all app using $(compose)
-	@docker-compose -f $(compose) stop
+	@docker compose -f $(compose) stop
 
 restart:
-	@docker-compose -f $(compose) restart
+	@docker compose -f $(compose) restart
 
 ps:  ## See all containers using $(compose)
-	@docker-compose -f $(compose) ps
+	@docker compose -f $(compose) ps
 
 rm:  ## Remove all containers using $(compose)
-	@docker-compose -f $(compose) rm -f
+	@docker compose -f $(compose) rm -f
 
 django_shell:  ## Open python terminal from django $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py shell
+	@docker compose -f $(compose) run --rm django python manage.py shell
 
 wagtail_sync: ## Wagtail sync Page fields (repeat every time you add a new language and to update the wagtailcore_page translations) $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py sync_page_translation_fields
+	@docker compose -f $(compose) run --rm django python manage.py sync_page_translation_fields
 
 wagtail_update_translation_field: ## Wagtail update translation fields, user this command first $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py update_translation_fields
+	@docker compose -f $(compose) run --rm django python manage.py update_translation_fields
 
 django_createsuperuser: ## Create a super user from django $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py createsuperuser
+	@docker compose -f $(compose) run --rm django python manage.py createsuperuser
 
 django_bash: ## Open a bash terminar from django container using $(compose)
-	@docker-compose -f $(compose) run --rm django bash
+	@docker compose -f $(compose) run --rm django bash
 
 django_test: ## Run tests from django container using $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py test
+	@docker compose -f $(compose) run --rm django python manage.py test
 
 django_fast: ## Run tests fast from django container using $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py test --failfast
+	@docker compose -f $(compose) run --rm django python manage.py test --failfast
 
 django_makemigrations: ## Run makemigrations from django container using $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py makemigrations
+	@docker compose -f $(compose) run --rm django python manage.py makemigrations
 
 django_migrate: ## Run migrate from django container using $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py migrate
+	@docker compose -f $(compose) run --rm django python manage.py migrate
 
 django_makemessages: ## Run ./manage.py makemessages $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py makemessages --all
+	@docker compose -f $(compose) run --rm django python manage.py makemessages --all
 
 django_compilemessages: ## Run ./manage.py compilemessages $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py compilemessages
+	@docker compose -f $(compose) run --rm django python manage.py compilemessages
 
 django_dump_auth: ## Run manage.py dumpdata auth --indent=2 $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py dumpdata auth --indent=2  --output=fixtures/auth.json
+	@docker compose -f $(compose) run --rm django python manage.py dumpdata auth --indent=2  --output=fixtures/auth.json
 
 django_load_auth: ## Run manage.py dumpdata auth --indent=2 $(compose)
-	@docker-compose -f $(compose) run --rm django python manage.py loaddata --database=default fixtures/auth.json
+	@docker compose -f $(compose) run --rm django python manage.py loaddata --database=default fixtures/auth.json
 
 dump_data: ## Dump database into .sql $(compose)
 	docker exec -t scielo_markup_local_postgres pg_dumpall -c -U debug > dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
@@ -121,7 +121,7 @@ clean_project_images:  ## Remove all images with "markup" on name
 	@docker rmi -f $$(docker images --filter=reference='*scielo_markup*' -q)
 
 volume_down:  ## Remove all volume
-	@docker-compose -f $(compose) down -v
+	@docker compose -f $(compose) down -v
 
 clean_migrations: ## Remove all migrations
 	@echo "Cleaning migrations..."

VERSION

@@ -0,0 +1 @@
+0.1.0

config/settings/base.py

@@ -120,13 +120,8 @@
 
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
-    }
-}
+DATABASES = {"default": env.db("DATABASE_URL")}
+DATABASES["default"]["ATOMIC_REQUESTS"] = True
 
 
 # Password validation

kubernetes/hml/configmap-markapi-hml.yml

@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: secrets-markapi-hml
+  namespace: markapi-hml
+  labels:
+    k8slens-edit-resource-version: v1
+spec: {}
+data:
+  CELERY_BROKER_URL: redis://redis:6379/0
+  CELERY_FLOWER_PASSWORD:
+  CELERY_FLOWER_USER:
+  DATABASE_URL:
+  DJANGO_ADMIN_URL: django-admin/
+  DJANGO_ALLOWED_HOSTS: '*'
+  DJANGO_DEBUG: 'True'
+  DJANGO_DEFAULT_FROM_EMAIL:
+  DJANGO_EMAIL_SUBJECT_PREFIX: '[MARKAPI-HML]'
+  DJANGO_SECRET_KEY: 
+  DJANGO_SETTINGS_MODULE: config.settings.production
+  EMAIL_HOST: smtp.gmail.com
+  EMAIL_HOST_PASSWORD: 
+  EMAIL_HOST_USER:
+  EMAIL_PORT: '587'
+  EMAIL_USE_TLS: 'True'
+  IPYTHONDIR: /app/.ipython
+  MAINTENANCE_MODE: 'False'
+  REDIS_URL: redis://redis:6379/0
+  SENTRY_DSN:
+  USE_DOCKER: 'yes'
+  WAGTAILADMIN_BASE_URL: https://hml-markapi.scielo.org
+  WAGTAIL_ADMIN_URL: admin/
+  HF_TOKEN:

kubernetes/hml/deployment-markapi-hml-celerybeat.yml

@@ -0,0 +1,61 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: markapi-hml-celerybeat
+  namespace: markapi-hml
+  generation: 1
+  labels:
+    app: markapi-hml-celerybeat
+    k8slens-edit-resource-version: v1
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+  selfLink: /apis/apps/v1/namespaces/markapi-hml/deployments/markapi-hml-celerybeat
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: markapi-hml-celerybeat
+  template:
+    metadata:
+      labels:
+        app: markapi-hml-celerybeat
+    spec:
+      volumes:
+        - name: markapi-hml-django-media
+          persistentVolumeClaim:
+            claimName: markapi-hml-django-media-pvclaim
+        - name: markapi-hml-django-tmp
+          persistentVolumeClaim:
+            claimName: markapi-hml-django-tmp-pvclaim
+      containers:
+        - name: webapp
+          image: scieloorg/markapi:v0.1.0
+          command:
+            - /start-celerybeat
+          envFrom:
+            - configMapRef:
+                name: configmap-markapi-hml
+          resources: {}
+          volumeMounts:
+            - name: markapi-hml-django-media
+              mountPath: /app/core/media
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst
+      securityContext: {}
+      schedulerName: default-scheduler
+      tolerations:
+        - key: app
+          operator: Equal
+          value: producao
+          effect: NoSchedule
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 1
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600

kubernetes/hml/deployment-markapi-hml-celeryworker.yml

@@ -0,0 +1,64 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: markapi-hml-celeryworker
+  namespace: markapi-hml
+  generation: 1
+  labels:
+    app: markapi-hml-celeryworker
+    k8slens-edit-resource-version: v1
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+  selfLink: /apis/apps/v1/namespaces/markapi-hml/deployments/markapi-hml-celeryworker
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: markapi-hml-celeryworker
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        app: markapi-hml-celeryworker
+    spec:
+      volumes:
+        - name: markapi-hml-django-media
+          persistentVolumeClaim:
+            claimName: markapi-hml-django-media-pvclaim
+        - name: markapi-hml-django-tmp
+          persistentVolumeClaim:
+            claimName: markapi-hml-django-tmp-pvclaim
+      containers:
+        - name: webapp
+          image: scieloorg/markapi:v0.1.0
+          command:
+            - /start-celeryworker
+          envFrom:
+            - configMapRef:
+                name: configmap-markapi-hml
+          resources: {}
+          volumeMounts:
+            - name: markapi-hml-django-media
+              mountPath: /app/core/media
+            - name: markapi-hml-django-tmp
+              mountPath: /tmp
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 120
+      dnsPolicy: ClusterFirst
+      securityContext: {}
+      schedulerName: default-scheduler
+      tolerations:
+        - key: app
+          operator: Equal
+          value: producao
+          effect: NoSchedule
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 1
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600