Skip to content

Commit 9892267

Browse files
pitangainnovarepitangainnovare
authored
Merge pull request #16 from pitangainnovare/major-fixes-v0.1.0
Remove arquivos desnecessários e corrige configurações
2 parents 7b58700 + 3109640 commit 9892267

16 files changed

+437
-115
lines changed

‎Dockerfile‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎Makefile‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,71 +32,71 @@ build_date: ## Show build date
3232
@echo "Build date: " $(SCMS_BUILD_DATE)
3333

3434
############################################
35-
## atalhos docker-compose desenvolvimento ##
35+
## atalhos docker compose desenvolvimento ##
3636
############################################
3737

3838
build: ## Build app using $(compose)
39-
@docker-compose -f $(compose) build
39+
@docker compose -f $(compose) build
4040

4141
build_no_cache: ## Build app using $(compose)
42-
@docker-compose -f $(compose) build --no-cache
42+
@docker compose -f $(compose) build --no-cache
4343

4444
up: ## Start app using $(compose)
45-
@docker-compose -f $(compose) up -d
45+
@docker compose -f $(compose) up -d
4646

4747
logs: ## See all app logs using $(compose)
48-
@docker-compose -f $(compose) logs -f
48+
@docker compose -f $(compose) logs -f
4949

5050
stop: ## Stop all app using $(compose)
51-
@docker-compose -f $(compose) stop
51+
@docker compose -f $(compose) stop
5252

5353
restart:
54-
@docker-compose -f $(compose) restart
54+
@docker compose -f $(compose) restart
5555

5656
ps: ## See all containers using $(compose)
57-
@docker-compose -f $(compose) ps
57+
@docker compose -f $(compose) ps
5858

5959
rm: ## Remove all containers using $(compose)
60-
@docker-compose -f $(compose) rm -f
60+
@docker compose -f $(compose) rm -f
6161

6262
django_shell: ## Open python terminal from django $(compose)
63-
@docker-compose -f $(compose) run --rm django python manage.py shell
63+
@docker compose -f $(compose) run --rm django python manage.py shell
6464

6565
wagtail_sync: ## Wagtail sync Page fields (repeat every time you add a new language and to update the wagtailcore_page translations) $(compose)
66-
@docker-compose -f $(compose) run --rm django python manage.py sync_page_translation_fields
66+
@docker compose -f $(compose) run --rm django python manage.py sync_page_translation_fields
6767

6868
wagtail_update_translation_field: ## Wagtail update translation fields, user this command first $(compose)
69-
@docker-compose -f $(compose) run --rm django python manage.py update_translation_fields
69+
@docker compose -f $(compose) run --rm django python manage.py update_translation_fields
7070

7171
django_createsuperuser: ## Create a super user from django $(compose)
72-
@docker-compose -f $(compose) run --rm django python manage.py createsuperuser
72+
@docker compose -f $(compose) run --rm django python manage.py createsuperuser
7373

7474
django_bash: ## Open a bash terminar from django container using $(compose)
75-
@docker-compose -f $(compose) run --rm django bash
75+
@docker compose -f $(compose) run --rm django bash
7676

7777
django_test: ## Run tests from django container using $(compose)
78-
@docker-compose -f $(compose) run --rm django python manage.py test
78+
@docker compose -f $(compose) run --rm django python manage.py test
7979

8080
django_fast: ## Run tests fast from django container using $(compose)
81-
@docker-compose -f $(compose) run --rm django python manage.py test --failfast
81+
@docker compose -f $(compose) run --rm django python manage.py test --failfast
8282

8383
django_makemigrations: ## Run makemigrations from django container using $(compose)
84-
@docker-compose -f $(compose) run --rm django python manage.py makemigrations
84+
@docker compose -f $(compose) run --rm django python manage.py makemigrations
8585

8686
django_migrate: ## Run migrate from django container using $(compose)
87-
@docker-compose -f $(compose) run --rm django python manage.py migrate
87+
@docker compose -f $(compose) run --rm django python manage.py migrate
8888

8989
django_makemessages: ## Run ./manage.py makemessages $(compose)
90-
@docker-compose -f $(compose) run --rm django python manage.py makemessages --all
90+
@docker compose -f $(compose) run --rm django python manage.py makemessages --all
9191

9292
django_compilemessages: ## Run ./manage.py compilemessages $(compose)
93-
@docker-compose -f $(compose) run --rm django python manage.py compilemessages
93+
@docker compose -f $(compose) run --rm django python manage.py compilemessages
9494

9595
django_dump_auth: ## Run manage.py dumpdata auth --indent=2 $(compose)
96-
@docker-compose -f $(compose) run --rm django python manage.py dumpdata auth --indent=2 --output=fixtures/auth.json
96+
@docker compose -f $(compose) run --rm django python manage.py dumpdata auth --indent=2 --output=fixtures/auth.json
9797

9898
django_load_auth: ## Run manage.py dumpdata auth --indent=2 $(compose)
99-
@docker-compose -f $(compose) run --rm django python manage.py loaddata --database=default fixtures/auth.json
99+
@docker compose -f $(compose) run --rm django python manage.py loaddata --database=default fixtures/auth.json
100100

101101
dump_data: ## Dump database into .sql $(compose)
102102
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
121121
@docker rmi -f $$(docker images --filter=reference='*scielo_markup*' -q)
122122

123123
volume_down: ## Remove all volume
124-
@docker-compose -f $(compose) down -v
124+
@docker compose -f $(compose) down -v
125125

126126
clean_migrations: ## Remove all migrations
127127
@echo "Cleaning migrations..."

‎VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.1.0

‎config/settings/base.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,8 @@
120120

121121
# Database
122122
# https://docs.djangoproject.com/en/5.1/ref/settings/#databases
123-
124-
DATABASES = {
125-
"default": {
126-
"ENGINE": "django.db.backends.sqlite3",
127-
"NAME": os.path.join(BASE_DIR, "db.sqlite3"),
128-
}
129-
}
123+
DATABASES = {"default": env.db("DATABASE_URL")}
124+
DATABASES["default"]["ATOMIC_REQUESTS"] = True
130125

131126

132127
# Password validation

‎kubernetes/hml/configmap-markapi-hml.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: secrets-markapi-hml
5+
namespace: markapi-hml
6+
labels:
7+
k8slens-edit-resource-version: v1
8+
spec: {}
9+
data:
10+
CELERY_BROKER_URL: redis://redis:6379/0
11+
CELERY_FLOWER_PASSWORD:
12+
CELERY_FLOWER_USER:
13+
DATABASE_URL:
14+
DJANGO_ADMIN_URL: django-admin/
15+
DJANGO_ALLOWED_HOSTS: '*'
16+
DJANGO_DEBUG: 'True'
17+
DJANGO_DEFAULT_FROM_EMAIL:
18+
DJANGO_EMAIL_SUBJECT_PREFIX: '[MARKAPI-HML]'
19+
DJANGO_SECRET_KEY:
20+
DJANGO_SETTINGS_MODULE: config.settings.production
21+
EMAIL_HOST: smtp.gmail.com
22+
EMAIL_HOST_PASSWORD:
23+
EMAIL_HOST_USER:
24+
EMAIL_PORT: '587'
25+
EMAIL_USE_TLS: 'True'
26+
IPYTHONDIR: /app/.ipython
27+
MAINTENANCE_MODE: 'False'
28+
REDIS_URL: redis://redis:6379/0
29+
SENTRY_DSN:
30+
USE_DOCKER: 'yes'
31+
WAGTAILADMIN_BASE_URL: https://hml-markapi.scielo.org
32+
WAGTAIL_ADMIN_URL: admin/
33+
HF_TOKEN:

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: markapi-hml-celerybeat
5+
namespace: markapi-hml
6+
generation: 1
7+
labels:
8+
app: markapi-hml-celerybeat
9+
k8slens-edit-resource-version: v1
10+
annotations:
11+
deployment.kubernetes.io/revision: '1'
12+
selfLink: /apis/apps/v1/namespaces/markapi-hml/deployments/markapi-hml-celerybeat
13+
spec:
14+
replicas: 1
15+
selector:
16+
matchLabels:
17+
app: markapi-hml-celerybeat
18+
template:
19+
metadata:
20+
labels:
21+
app: markapi-hml-celerybeat
22+
spec:
23+
volumes:
24+
- name: markapi-hml-django-media
25+
persistentVolumeClaim:
26+
claimName: markapi-hml-django-media-pvclaim
27+
- name: markapi-hml-django-tmp
28+
persistentVolumeClaim:
29+
claimName: markapi-hml-django-tmp-pvclaim
30+
containers:
31+
- name: webapp
32+
image: scieloorg/markapi:v0.1.0
33+
command:
34+
- /start-celerybeat
35+
envFrom:
36+
- configMapRef:
37+
name: configmap-markapi-hml
38+
resources: {}
39+
volumeMounts:
40+
- name: markapi-hml-django-media
41+
mountPath: /app/core/media
42+
terminationMessagePath: /dev/termination-log
43+
terminationMessagePolicy: File
44+
imagePullPolicy: Always
45+
restartPolicy: Always
46+
terminationGracePeriodSeconds: 30
47+
dnsPolicy: ClusterFirst
48+
securityContext: {}
49+
schedulerName: default-scheduler
50+
tolerations:
51+
- key: app
52+
operator: Equal
53+
value: producao
54+
effect: NoSchedule
55+
strategy:
56+
type: RollingUpdate
57+
rollingUpdate:
58+
maxUnavailable: 1
59+
maxSurge: 1
60+
revisionHistoryLimit: 10
61+
progressDeadlineSeconds: 600

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: markapi-hml-celeryworker
5+
namespace: markapi-hml
6+
generation: 1
7+
labels:
8+
app: markapi-hml-celeryworker
9+
k8slens-edit-resource-version: v1
10+
annotations:
11+
deployment.kubernetes.io/revision: '1'
12+
selfLink: /apis/apps/v1/namespaces/markapi-hml/deployments/markapi-hml-celeryworker
13+
spec:
14+
replicas: 1
15+
selector:
16+
matchLabels:
17+
app: markapi-hml-celeryworker
18+
template:
19+
metadata:
20+
creationTimestamp: null
21+
labels:
22+
app: markapi-hml-celeryworker
23+
spec:
24+
volumes:
25+
- name: markapi-hml-django-media
26+
persistentVolumeClaim:
27+
claimName: markapi-hml-django-media-pvclaim
28+
- name: markapi-hml-django-tmp
29+
persistentVolumeClaim:
30+
claimName: markapi-hml-django-tmp-pvclaim
31+
containers:
32+
- name: webapp
33+
image: scieloorg/markapi:v0.1.0
34+
command:
35+
- /start-celeryworker
36+
envFrom:
37+
- configMapRef:
38+
name: configmap-markapi-hml
39+
resources: {}
40+
volumeMounts:
41+
- name: markapi-hml-django-media
42+
mountPath: /app/core/media
43+
- name: markapi-hml-django-tmp
44+
mountPath: /tmp
45+
terminationMessagePath: /dev/termination-log
46+
terminationMessagePolicy: File
47+
imagePullPolicy: Always
48+
restartPolicy: Always
49+
terminationGracePeriodSeconds: 120
50+
dnsPolicy: ClusterFirst
51+
securityContext: {}
52+
schedulerName: default-scheduler
53+
tolerations:
54+
- key: app
55+
operator: Equal
56+
value: producao
57+
effect: NoSchedule
58+
strategy:
59+
type: RollingUpdate
60+
rollingUpdate:
61+
maxUnavailable: 1
62+
maxSurge: 1
63+
revisionHistoryLimit: 10
64+
progressDeadlineSeconds: 600

0 commit comments

Comments
 (0)