Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion estela-api/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,18 @@ def container_image(self):
def get_candidate_image(self):
"""Get the candidate container image for builds."""
parsed_container_host = urlparse(settings.REGISTRY_HOST)
return "{}/{}:estela_{}_candidate".format(

# In local mode, don't use _candidate suffix (build directly as production)
if settings.CREDENTIALS == 'local':
suffix = ""
else:
suffix = "_candidate"

return "{}/{}:estela_{}{}".format(
parsed_container_host.netloc or settings.REGISTRY_HOST,
settings.REPOSITORY_NAME,
self.pid,
suffix,
)

def get_production_image(self):
Expand Down
16 changes: 14 additions & 2 deletions installation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ WEB_DIR = ../estela-web
API_POD = $$(kubectl get pod -l app=estela-django-api -o jsonpath="{.items[0].metadata.name}")
API_IP = $$(kubectl get services -n $${NAMESPACE} estela-django-api-service --output jsonpath='{.spec.clusterIP}')
LOCAL_API_IP = $$(kubectl get services -n $${NAMESPACE} estela-django-api-service --output jsonpath='{.status.loadBalancer.ingress[0].ip}')
RESOURCES = db registry minio zookeeper kafka
SERVICES ?= django-api celery-worker celery-beat redis build-project
RESOURCES = db registry minio zookeeper kafka mongodb
SERVICES ?= django-api celery-worker celery-beat redis build-project project-downloader
PLATFORM ?= linux/$(shell uname -m)


Expand Down Expand Up @@ -59,6 +59,18 @@ uninstall:
-. ./local/.env && cd helm-chart && helm uninstall $${RELEASE_NAME} -n $${NAMESPACE}


MINIO_NETWORK = $$(docker inspect estela_storage --format '{{range $$k,$$v := .NetworkSettings.Networks}}{{$$k}}{{end}}')
MINIO_IP = $$(docker inspect estela_storage --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}')
BUCKET_NAME = $$(grep "^BUCKET_NAME_PROJECTS:" helm-chart/values.yaml | awk '{print $$2}' | tr -d '"' | tr -d "'")

.PHONY: setup-minio-bucket
setup-minio-bucket:
-docker run --rm --network $(MINIO_NETWORK) --entrypoint sh minio/mc -c \
"mc alias set myminio http://$(MINIO_IP):9000 minioadmin minioadmin && \
mc mb myminio/$(BUCKET_NAME) --ignore-existing && \
mc anonymous set download myminio/$(BUCKET_NAME)"


.PHONY: update-api-ip
update-api-ip:
-. ./local/.env && cd helm-chart && \
Expand Down
2 changes: 1 addition & 1 deletion installation/helm-chart/templates/API/api-secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
EMAIL_HOST_USER: {{ .Values.EMAIL_HOST_USER | b64enc }}
EMAIL_HOST_PASSWORD: {{ .Values.EMAIL_HOST_PASSWORD | b64enc }}
SECRET_KEY: {{ .Values.SECRET_KEY | b64enc }}
EXTERNAL_APP_KEYS: {{ .Values.EXTERNAL_APP_KEYS | b64enc }}
EXTERNAL_APP_KEYS: {{ .Values.EXTERNAL_APP_KEYS | default "none" | b64enc }}
{{- if .Values.AWS_ACCESS_KEY_ID }}
AWS_ACCESS_KEY_ID: {{ .Values.AWS_ACCESS_KEY_ID | b64enc }}
{{- end }}
Expand Down
12 changes: 12 additions & 0 deletions installation/local/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,19 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock

mongodb:
container_name: estela_mongodb
image: mongo:6.0
ports:
- "27017:27017"
environment:
MONGO_INITDB_DATABASE: estela
volumes:
- mongodb_data:/data/db
restart: unless-stopped

volumes:
estela_dbdata:
registry_data:
datastore:
mongodb_data: