Skip to content
Merged
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
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@ build
## TODO: get Cortal from Core-Styles (then remove this exception)
!**/fonts/Cortal-Icons-*

## environment variables
docker_repo.var
needs_demo.var

# Static and Media folders
/static
/media

# UI Pattern Demo
/taccsite_ui/dist

# Secrets and Customizations
*secrets*.py
*settings_default*.py
Expand Down
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,8 @@ RUN npm ci

# Build assets
COPY . /code/
ARG NEEDS_DEMO
ARG BUILD_ID
RUN if [ "$NEEDS_DEMO" = "true" ]; then \
npm run build --build-id="$BUILD_ID"; \
else \
npm run build:css --build-id="$BUILD_ID"; \
fi
RUN npm run build --build-id="$BUILD_ID"



Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKERHUB_REPO := taccwma/$(shell cat ./docker_repo.var)
DOCKERHUB_REPO := taccwma/core-cms
DOCKER_TAG ?= $(shell git rev-parse --short HEAD)
DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG)
DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest
Expand All @@ -9,7 +9,6 @@ DOCKER_COMPOSE_CMD := $(shell if command -v docker-compose > /dev/null; then ech
# NOTE: Special characters in `DOCKER_IMAGE_BRANCH` are replaced with dashes.
DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD | sed 's/[^[:alnum:]\.\_\-]/-/g')

NEEDS_DEMO := $(shell cat ./needs_demo.var)
BUILD_ID := $(shell git describe --always)

.PHONY: build
Expand All @@ -21,7 +20,6 @@ build-full:
docker build -t $(DOCKER_IMAGE) \
--target production \
--build-arg BUILD_ID="$(BUILD_ID)" \
--build-arg NEEDS_DEMO="$(NEEDS_DEMO)" \
-f ./Dockerfile .

docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH)
Expand Down
19 changes: 0 additions & 19 deletions bin/setup-cms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,6 @@ for file in settings_custom settings_local secrets; do
fi
done

# Create expected .var files if they don't exist (if enabled)
if [ "$CREATE_VAR_FILES" = true ]; then
echo -e "${INF}Setting up .var files...${RST}"
if [ ! -f "needs_demo.var" ]; then
echo "false" > needs_demo.var
echo -e " ${POS}Created needs_demo.var${RST}"
else
echo -e " ${INF}needs_demo.var already exists${RST}"
fi
if [ ! -f "docker_repo.var" ]; then
echo "core-cms" > docker_repo.var
echo -e " ${POS}Created docker_repo.var${RST}"
else
echo -e " ${INF}docker_repo.var already exists${RST}"
fi
else
echo -e "${INF}Skipping .var file creation (disabled)${RST}"
fi

# Build and start Docker containers (from project root)
echo -e "${INF}Building and starting Docker containers...${RST}"
cd "$PROJECT_ROOT"
Expand Down

This file was deleted.

4 changes: 0 additions & 4 deletions taccsite_cms/static/site_cms/css/src/_imports/config.yml

This file was deleted.