From 4d0ac2b70820600b3b63e29c62e283d564c218fd Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jul 2024 13:36:54 -0500 Subject: [PATCH 1/3] feat(tapisproject): migrate from _cms to _assets --- .../hawaii-header-trimmed.png | Bin .../migrate.to-core-cms-v3.css | 2 +- .../tapis-logo-navbar.png | Bin tapisproject_cms/.dockerignore | 4 -- tapisproject_cms/Dockerfile | 6 -- tapisproject_cms/Makefile | 38 ------------ tapisproject_cms/README.md | 7 --- tapisproject_cms/docker-compose.dev.yml | 56 ------------------ tapisproject_cms/elasticsearch.yml | 14 ----- tapisproject_cms/src/__init__.py | 0 .../taccsite_cms/templates/assets_custom.html | 22 ------- .../tapisproject_cms/__init__.py | 0 12 files changed, 1 insertion(+), 148 deletions(-) rename {tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos => tapisproject_assets}/hawaii-header-trimmed.png (100%) rename tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css => tapisproject_assets/migrate.to-core-cms-v3.css (94%) rename {tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos => tapisproject_assets}/tapis-logo-navbar.png (100%) delete mode 100644 tapisproject_cms/.dockerignore delete mode 100644 tapisproject_cms/Dockerfile delete mode 100644 tapisproject_cms/Makefile delete mode 100644 tapisproject_cms/README.md delete mode 100644 tapisproject_cms/docker-compose.dev.yml delete mode 100644 tapisproject_cms/elasticsearch.yml delete mode 100755 tapisproject_cms/src/__init__.py delete mode 100644 tapisproject_cms/src/taccsite_cms/templates/assets_custom.html delete mode 100755 tapisproject_cms/src/taccsite_custom/tapisproject_cms/__init__.py diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/hawaii-header-trimmed.png b/tapisproject_assets/hawaii-header-trimmed.png similarity index 100% rename from tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/hawaii-header-trimmed.png rename to tapisproject_assets/hawaii-header-trimmed.png diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css b/tapisproject_assets/migrate.to-core-cms-v3.css similarity index 94% rename from tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css rename to tapisproject_assets/migrate.to-core-cms-v3.css index b486ace3..07054aff 100644 --- a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css +++ b/tapisproject_assets/migrate.to-core-cms-v3.css @@ -34,7 +34,7 @@ table { :is(td,th) { color: usnet; /* Bootstrap: none (inherit) | TACC: var(--global-color-primary--dark) */ } -/* FAQ: Did not restore, because it makes table easier to scan *//* +/* FAQ: Did not restore, because table is easier to scan as is *//* tr:nth-child(2n) :is(th,td) { background: unset; /* Bootstrap: none (inherit) | TACC: var(--global-color-primary--x-light) *\/ } diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/tapis-logo-navbar.png b/tapisproject_assets/tapis-logo-navbar.png similarity index 100% rename from tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/tapis-logo-navbar.png rename to tapisproject_assets/tapis-logo-navbar.png diff --git a/tapisproject_cms/.dockerignore b/tapisproject_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/tapisproject_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/tapisproject_cms/Dockerfile b/tapisproject_cms/Dockerfile deleted file mode 100644 index a2053321..00000000 --- a/tapisproject_cms/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM taccwma/core-cms:v4.12.0 - -WORKDIR /code - -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/tapisproject_cms/Makefile b/tapisproject_cms/Makefile deleted file mode 100644 index b4b1daaa..00000000 --- a/tapisproject_cms/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -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 diff --git a/tapisproject_cms/README.md b/tapisproject_cms/README.md deleted file mode 100644 index 59a51232..00000000 --- a/tapisproject_cms/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Example - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/tapisproject_cms/docker-compose.dev.yml b/tapisproject_cms/docker-compose.dev.yml deleted file mode 100644 index 2aeb7843..00000000 --- a/tapisproject_cms/docker-compose.dev.yml +++ /dev/null @@ -1,56 +0,0 @@ -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:11.5 - 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: diff --git a/tapisproject_cms/elasticsearch.yml b/tapisproject_cms/elasticsearch.yml deleted file mode 100644 index 55847499..00000000 --- a/tapisproject_cms/elasticsearch.yml +++ /dev/null @@ -1,14 +0,0 @@ -#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 \ No newline at end of file diff --git a/tapisproject_cms/src/__init__.py b/tapisproject_cms/src/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html deleted file mode 100644 index ee27c0b4..00000000 --- a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html +++ /dev/null @@ -1,22 +0,0 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} - -{% load static %} - - -{% with settings.PORTAL_FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} - - - diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/__init__.py b/tapisproject_cms/src/taccsite_custom/tapisproject_cms/__init__.py deleted file mode 100755 index e69de29b..00000000 From bb88869052f684529f1d3971f1c3d7c6e63a6cdf Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jul 2024 18:47:55 -0500 Subject: [PATCH 2/3] feat(netsage): migrate from _cms to _assets --- .../netsage_cyber_icon.ico | Bin .../netsage_cyber_icon.ico:Zone.Identifier | 0 .../netsage_cyber_logo_color.png | Bin ...tsage_cyber_logo_color.png:Zone.Identifier | 0 .../netsage_icon.ico | Bin .../netsage_icon.ico:Zone.Identifier | 0 .../netsage_logo_color.png | Bin .../netsage_logo_color.png:Zone.Identifier | 0 netsage_cms/.dockerignore | 4 -- netsage_cms/Dockerfile | 7 --- netsage_cms/Makefile | 38 ------------ netsage_cms/README.md | 7 --- netsage_cms/docker-compose.dev.yml | 56 ------------------ netsage_cms/elasticsearch.yml | 14 ----- .../src/apps/custom_example/__init__.py | 0 netsage_cms/src/apps/custom_example/apps.py | 5 -- .../custom_example/custom_example.html | 4 -- netsage_cms/src/apps/custom_example/urls.py | 7 --- netsage_cms/src/apps/custom_example/views.py | 9 --- netsage_cms/src/taccsite_cms/README.md | 3 - .../taccsite_custom/netsage_cms/__init__.py | 0 .../netsage_cms/img/favicons/favicon.ico | Bin 34494 -> 0 bytes .../netsage_cms/img/org_logos/portal.png | Bin 1913 -> 0 bytes 23 files changed, 154 deletions(-) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons => netsage_assets}/netsage_cyber_icon.ico (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons => netsage_assets}/netsage_cyber_icon.ico:Zone.Identifier (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos => netsage_assets}/netsage_cyber_logo_color.png (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos => netsage_assets}/netsage_cyber_logo_color.png:Zone.Identifier (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons => netsage_assets}/netsage_icon.ico (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons => netsage_assets}/netsage_icon.ico:Zone.Identifier (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos => netsage_assets}/netsage_logo_color.png (100%) rename {netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos => netsage_assets}/netsage_logo_color.png:Zone.Identifier (100%) delete mode 100644 netsage_cms/.dockerignore delete mode 100644 netsage_cms/Dockerfile delete mode 100644 netsage_cms/Makefile delete mode 100644 netsage_cms/README.md delete mode 100644 netsage_cms/docker-compose.dev.yml delete mode 100644 netsage_cms/elasticsearch.yml delete mode 100644 netsage_cms/src/apps/custom_example/__init__.py delete mode 100644 netsage_cms/src/apps/custom_example/apps.py delete mode 100644 netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html delete mode 100644 netsage_cms/src/apps/custom_example/urls.py delete mode 100644 netsage_cms/src/apps/custom_example/views.py delete mode 100644 netsage_cms/src/taccsite_cms/README.md delete mode 100644 netsage_cms/src/taccsite_custom/netsage_cms/__init__.py delete mode 100644 netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/favicon.ico delete mode 100644 netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/portal.png diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico b/netsage_assets/netsage_cyber_icon.ico similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico rename to netsage_assets/netsage_cyber_icon.ico diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico:Zone.Identifier b/netsage_assets/netsage_cyber_icon.ico:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico:Zone.Identifier rename to netsage_assets/netsage_cyber_icon.ico:Zone.Identifier diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png b/netsage_assets/netsage_cyber_logo_color.png similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png rename to netsage_assets/netsage_cyber_logo_color.png diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png:Zone.Identifier b/netsage_assets/netsage_cyber_logo_color.png:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png:Zone.Identifier rename to netsage_assets/netsage_cyber_logo_color.png:Zone.Identifier diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico b/netsage_assets/netsage_icon.ico similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico rename to netsage_assets/netsage_icon.ico diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico:Zone.Identifier b/netsage_assets/netsage_icon.ico:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico:Zone.Identifier rename to netsage_assets/netsage_icon.ico:Zone.Identifier diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png b/netsage_assets/netsage_logo_color.png similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png rename to netsage_assets/netsage_logo_color.png diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png:Zone.Identifier b/netsage_assets/netsage_logo_color.png:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png:Zone.Identifier rename to netsage_assets/netsage_logo_color.png:Zone.Identifier diff --git a/netsage_cms/.dockerignore b/netsage_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/netsage_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/netsage_cms/Dockerfile b/netsage_cms/Dockerfile deleted file mode 100644 index 2d1d6b33..00000000 --- a/netsage_cms/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM taccwma/core-cms:v4.12.0 - -WORKDIR /code - -COPY /src/apps /code/apps -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/netsage_cms/Makefile b/netsage_cms/Makefile deleted file mode 100644 index b4b1daaa..00000000 --- a/netsage_cms/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -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 diff --git a/netsage_cms/README.md b/netsage_cms/README.md deleted file mode 100644 index 59a51232..00000000 --- a/netsage_cms/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Example - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/netsage_cms/docker-compose.dev.yml b/netsage_cms/docker-compose.dev.yml deleted file mode 100644 index 2aeb7843..00000000 --- a/netsage_cms/docker-compose.dev.yml +++ /dev/null @@ -1,56 +0,0 @@ -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:11.5 - 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: diff --git a/netsage_cms/elasticsearch.yml b/netsage_cms/elasticsearch.yml deleted file mode 100644 index 55847499..00000000 --- a/netsage_cms/elasticsearch.yml +++ /dev/null @@ -1,14 +0,0 @@ -#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 \ No newline at end of file diff --git a/netsage_cms/src/apps/custom_example/__init__.py b/netsage_cms/src/apps/custom_example/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/netsage_cms/src/apps/custom_example/apps.py b/netsage_cms/src/apps/custom_example/apps.py deleted file mode 100644 index 672181cf..00000000 --- a/netsage_cms/src/apps/custom_example/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class CustomExampleConfig(AppConfig): - name = 'custom_example' diff --git a/netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html b/netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html deleted file mode 100644 index 93902fc3..00000000 --- a/netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "base.html" %} -{% block content %} -This page will contain custom content. -{%endblock %} diff --git a/netsage_cms/src/apps/custom_example/urls.py b/netsage_cms/src/apps/custom_example/urls.py deleted file mode 100644 index d38dbd09..00000000 --- a/netsage_cms/src/apps/custom_example/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.urls import re_path -from .views import AddedView - -app_name = 'custom_example' -urlpatterns = [ - re_path('', AddedView, name='index'), -] diff --git a/netsage_cms/src/apps/custom_example/views.py b/netsage_cms/src/apps/custom_example/views.py deleted file mode 100644 index 985d9732..00000000 --- a/netsage_cms/src/apps/custom_example/views.py +++ /dev/null @@ -1,9 +0,0 @@ -from curses.ascii import HT -from django.http import HttpResponse -from django.conf import settings -from django.template import loader - - -def AddedView(request): - template = loader.get_template('custom_example/custom_example.html') - return HttpResponse(template.render({}, request)) diff --git a/netsage_cms/src/taccsite_cms/README.md b/netsage_cms/src/taccsite_cms/README.md deleted file mode 100644 index efec6909..00000000 --- a/netsage_cms/src/taccsite_cms/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `taccsite_cms/` - -Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/__init__.py b/netsage_cms/src/taccsite_custom/netsage_cms/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/favicon.ico b/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/favicon.ico deleted file mode 100644 index 533966ed9f6346e9428e7b34ca693b5dab0a6966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34494 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 W4Dx@^7z1z5SmxsaPGA3z5%^ys-eMU5 diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/portal.png b/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/portal.png deleted file mode 100644 index 3ec463826af8c20f80ba704c2f22977dd4334284..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913 zcmV-<2Zs2GP)36*LW^5qtmu02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00!YnL_t(|+U=Zaj2*=h$A4un zHV(VQB%J1OVvEB@;D{?&99~!sbJ!4pEG$_>5JV(Epb!N6T?UDZ?l zz;PVMaU92S9LI4S$8j9TaU92S9LI5-@3Ce#C}|?_GvF{_Z(s(nGw>tehrkbjO~86! z2v`fO0#=yWznb_C#{i4dci9!_20jGd2Oa~Knb{i!+dcp|9GC^{nU3$rX&;k-4Z#0_ zH-Q0QIq-y;$yII(N751%XPu<;B~56c|AQs1$=Tl>lD2Kp_}-RuPMv){uX31QU|x5T z^lhZQ=Nif!}qI+uQ>jRpYT=xPdgr!@zdHy5ozO>lJ;$2e2=7u5M96yzzM*E8P8uL zY5NY*lM~a!hfJey;VwKbgY^3|>YN~HI8yJr8vX4qX(Ui@L{eYi`7TK-B7Oa(+2fOR zZbqe6xb^8vXn=(8s2LY>5ZyC17R`1Gh(tkF8Pt^oVP9ubHg~^fdyU4}^|f z7f71ic*tqSy}uH$H)2Kqw>5Y1j-+(5qP^@w~@8YG5Rw<$mT!*1H)tF-6hSR8%V0uF?u5MeIjF6V`jrO`db~5&njVTu|tS$IzUGj1Z0nz z*#_W+K-tM|AmxyC0x}el$4;Hz%F$o!nb{?bZO=N#Rh9T-4#^4NXg)Brwdvo>1JzD) z11X37BJwZI?2Aa*%!vGx9Q}P7kxy?V)g{8>i2RL;>qqG0-{YhH4jIT#8$2#|1F2Jq z{*zH>+XhzVp^Q0cn(HI!+zhwlnGTFU{yFOJ0g@A~aqDJP!ayXQ0h|#je!M_z@@1_) z)8pQeNO5-qW0@prnxqAi`iY;W3Am@i?$tDstmUz+95sjEkYr+yTLbB8VP6X+-2>bL zJWG=PejsoruqY$AU6#>iOp!-&zSD4I4vHAaX_D$mXTQ(P1}m%^C$o8S;%8>|-!Zc1 zNHP>gGgs17GaGUP$ z$ts0S4p$oK#K7d@G(hxNk8xh;1DyLZDx1Y zad$hm66Z-Hk3I9hf_KLsu$0sYLLVZhlceTXoo226$GCwMP#`m#VrDy;*(@_V&CISe zvw;F_u8GKJO?H&O0a{M3MK+3|*Hbw%+Zo*l zayxKYfvSVRiK#18CU+7}joF)O+`^kfIJ;n&Brh%xFGb`>xPer|NUk7B=Xf{IqM5or z2ecw_(9G5YcSVXXuE6xoi^$icJ769LGUAYq)HP!qB54xIZ#gXj_6K$$`8M)V8jm~z z+-+uW;W&=tIF92uj^j9v<2a7vIF92uTOi*7L5of`p4>6(00000NkvXXu0mjfooa-M From 3acbc7120953c594fed50ce303fc51c89aaf8fca Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jul 2024 19:07:29 -0500 Subject: [PATCH 3/3] feat(matcssi): migrate from _cms to _assets --- .../matcssi_logo.png | Bin matcssi_cms/.dockerignore | 4 -- matcssi_cms/Dockerfile | 6 -- matcssi_cms/Makefile | 38 ------------ matcssi_cms/README.md | 9 --- matcssi_cms/docker-compose.dev.yml | 56 ------------------ matcssi_cms/elasticsearch.yml | 14 ----- matcssi_cms/src/taccsite_cms/README.md | 3 - .../taccsite_custom/matcssi_cms/__init__.py | 0 .../matcssi_cms/img/favicons/favicon.ico | Bin 34494 -> 0 bytes 10 files changed, 130 deletions(-) rename matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/org_logos/matcssi.png => matcssi_assets/matcssi_logo.png (100%) delete mode 100644 matcssi_cms/.dockerignore delete mode 100644 matcssi_cms/Dockerfile delete mode 100644 matcssi_cms/Makefile delete mode 100644 matcssi_cms/README.md delete mode 100644 matcssi_cms/docker-compose.dev.yml delete mode 100644 matcssi_cms/elasticsearch.yml delete mode 100644 matcssi_cms/src/taccsite_cms/README.md delete mode 100755 matcssi_cms/src/taccsite_custom/matcssi_cms/__init__.py delete mode 100644 matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/favicons/favicon.ico diff --git a/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/org_logos/matcssi.png b/matcssi_assets/matcssi_logo.png similarity index 100% rename from matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/org_logos/matcssi.png rename to matcssi_assets/matcssi_logo.png diff --git a/matcssi_cms/.dockerignore b/matcssi_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/matcssi_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/matcssi_cms/Dockerfile b/matcssi_cms/Dockerfile deleted file mode 100644 index a2053321..00000000 --- a/matcssi_cms/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM taccwma/core-cms:v4.12.0 - -WORKDIR /code - -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/matcssi_cms/Makefile b/matcssi_cms/Makefile deleted file mode 100644 index b4b1daaa..00000000 --- a/matcssi_cms/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -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 diff --git a/matcssi_cms/README.md b/matcssi_cms/README.md deleted file mode 100644 index d3118cd4..00000000 --- a/matcssi_cms/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# MatCSSI - -https://matcssi.tacc.utexas.edu/ - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/matcssi_cms/docker-compose.dev.yml b/matcssi_cms/docker-compose.dev.yml deleted file mode 100644 index 2aeb7843..00000000 --- a/matcssi_cms/docker-compose.dev.yml +++ /dev/null @@ -1,56 +0,0 @@ -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:11.5 - 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: diff --git a/matcssi_cms/elasticsearch.yml b/matcssi_cms/elasticsearch.yml deleted file mode 100644 index 55847499..00000000 --- a/matcssi_cms/elasticsearch.yml +++ /dev/null @@ -1,14 +0,0 @@ -#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 \ No newline at end of file diff --git a/matcssi_cms/src/taccsite_cms/README.md b/matcssi_cms/src/taccsite_cms/README.md deleted file mode 100644 index efec6909..00000000 --- a/matcssi_cms/src/taccsite_cms/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `taccsite_cms/` - -Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/matcssi_cms/src/taccsite_custom/matcssi_cms/__init__.py b/matcssi_cms/src/taccsite_custom/matcssi_cms/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/favicons/favicon.ico b/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/favicons/favicon.ico deleted file mode 100644 index 533966ed9f6346e9428e7b34ca693b5dab0a6966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34494 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 W4Dx@^7z1z5SmxsaPGA3z5%^ys-eMU5