Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: TV3-181 add ptdatax #257

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 4 additions & 0 deletions ptdatax_cms/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.git
.cache
**/secrets.py
**/settings_local.py
7 changes: 7 additions & 0 deletions ptdatax_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# v4.4.0
FROM taccwma/core-cms:42b4a97

WORKDIR /code

COPY /src/taccsite_custom /code/taccsite_custom
COPY /src/taccsite_cms /code/taccsite_cms
38 changes: 38 additions & 0 deletions ptdatax_cms/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
DOCKERHUB_REPO := $(shell cat ./docker_repo.var)
DOCKER_TAG ?= $(shell git rev-parse --short HEAD)
DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG)
DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest

# `DOCKER_IMAGE_BRANCH` tag is the git tag for the commit if it exists, else the branch on which the commit exists
DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD)

#.PHONY: build
build:
docker-compose -f docker-compose.dev.yml build

.PHONY: build-full
build-full:
docker build -t $(DOCKER_IMAGE) --target production -f Dockerfile .
docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH) # Note: Currently broken for branches with slashes

.PHONY: publish
publish:
docker push $(DOCKER_IMAGE)
docker push $(DOCKER_IMAGE_BRANCH)

.PHONY: publish-latest
publish-latest:
docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST)
docker push $(DOCKER_IMAGE_LATEST)

.PHONY: start
start:
docker-compose -f docker-compose.dev.yml up

.PHONY: stop
stop:
docker-compose -f docker-compose.dev.yml down

.PHONY: stop-full
stop-v:
docker-compose -f docker-compose.dev.yml down -v
7 changes: 7 additions & 0 deletions ptdatax_cms/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Example

An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project

## Basics

See [Core-CMS-Custom](../README.md).
56 changes: 56 additions & 0 deletions ptdatax_cms/docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: "3"
services:
cms:
build: .
ports:
- 127.0.0.1:8000:8000
command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
container_name: core_cms
hostname: core_cms
volumes:
- ./src/apps:/code/apps
- ./src/taccsite_custom:/code/taccsite_custom
- ./src/taccsite_cms/custom_app_settings.py:/code/taccsite_cms/custom_app_settings.py
- ./src/taccsite_cms/urls_custom.py:/code/taccsite_cms/urls_custom.py
- ./src/taccsite_cms/settings_custom.py:/code/taccsite_cms/settings_custom.py
- ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py
- ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py
networks:
- core_cms_net

postgres:
image: postgres:14.9
environment:
- POSTGRES_PASSWORD=taccforever
- POSTGRES_USER=postgresadmin
- POSTGRES_DB=taccsite
- PGDATA=/var/lib/postgresql/data/taccsite
volumes:
- core_cms_postgres_data:/var/lib/postgresql/data
hostname: core_cms_postgres
container_name: core_cms_postgres
networks:
- core_cms_net

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
ulimits:
memlock: -1
environment:
- ES_HEAP_SIZE:1g
- discovery.type=single-node
volumes:
- ./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- core_cms_es_data:/usr/share/elasticsearch/data
container_name: core_cms_elasticsearch
ports:
- 127.0.0.1:9201:9200
networks:
- core_cms_net

volumes:
core_cms_postgres_data:
core_cms_es_data:

networks:
core_cms_net:
14 changes: 14 additions & 0 deletions ptdatax_cms/elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#Use this to configure elasticsearch
#More info: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
#
cluster.name: es-dev
network.host: 0.0.0.0
#network.publish_host: hostname
node.name: es01
#minimum_master_nodes need to be explicitly set when bound on a public IP
# set to 1 to allow single node clusters
# Details: https://github.com/elastic/elasticsearch/pull/17288
discovery.zen.minimum_master_nodes: 1
#More info about memory_lock: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html
bootstrap.memory_lock: true
xpack.security.enabled: false
3 changes: 3 additions & 0 deletions ptdatax_cms/src/taccsite_cms/custom_app_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CUSTOM_APPS = []
CUSTOM_MIDDLEWARE = []
STATICFILES_DIRS = ()
66 changes: 66 additions & 0 deletions ptdatax_cms/src/taccsite_cms/settings_custom.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# CUSTOM SETTINGS VALUES.
# TACC WMA CMS SITE:
# *.PTDATAX.TACC.UTEXAS.EDU

########################
# DJANGO CMS SETTINGS
########################

CMS_TEMPLATES = (
('standard.html', 'Standard'),
('fullwidth.html', 'Full Width'),
)

########################
# TACC: BRANDING
########################

# from taccsite_cms.settings import TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING
#
# _CUSTOM_BRANDING = [
# "example",
# "example_cms/img/org_logos/example-logo.png",
# "",
# "https://example.com",
# "_blank",
# "Example Logo",
# "anonymous",
# "True"
# ]

# BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING, _CUSTOM_BRANDING ]

########################
# TACC: LOGOS
########################

LOGO = [
"PTDataX",
"ptdatax_cms/img/org_logos/ptdatax.png",
"",
"/",
"_self",
"Logo for Portal Texas 2050 DataX Portal",
"anonymous",
"True"
]

FAVICON = {
"img_file_src": "ptdatax_cms/img/favicons/favicon.ico"
}

########################
# TACC: PORTAL
########################

INCLUDES_CORE_PORTAL = True
# INCLUDES_PORTAL_NAV = False
INCLUDES_SEARCH_BAR = False

########################
# TACC: CORE STYLES
########################

# Only use integer numbers (not "v1", not "0.11.0"),
# so templates can load based on simple comparisons
TACC_CORE_STYLES_VERSION = 2
3 changes: 3 additions & 0 deletions ptdatax_cms/src/taccsite_cms/urls_custom.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.urls import path, include

custom_urls = []
Empty file.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.