File tree Expand file tree Collapse file tree 6 files changed +2
-41
lines changed
taccsite_cms/static/site_cms/css/src Expand file tree Collapse file tree 6 files changed +2
-41
lines changed Original file line number Diff line number Diff line change @@ -20,17 +20,10 @@ build
2020# # TODO: get Cortal from Core-Styles (then remove this exception)
2121! ** /fonts /Cortal-Icons- *
2222
23- # # environment variables
24- docker_repo.var
25- needs_demo.var
26-
2723# Static and Media folders
2824/static
2925/media
3026
31- # UI Pattern Demo
32- /taccsite_ui /dist
33-
3427# Secrets and Customizations
3528* secrets * .py
3629* settings_default * .py
Original file line number Diff line number Diff line change @@ -46,13 +46,8 @@ RUN npm ci
4646
4747# Build assets
4848COPY . /code/
49- ARG NEEDS_DEMO
5049ARG BUILD_ID
51- RUN if [ "$NEEDS_DEMO" = "true" ]; then \
52- npm run build --build-id="$BUILD_ID" ; \
53- else \
54- npm run build:css --build-id="$BUILD_ID" ; \
55- fi
50+ RUN npm run build --build-id="$BUILD_ID"
5651
5752
5853
Original file line number Diff line number Diff line change 1- DOCKERHUB_REPO := taccwma/$( shell cat ./docker_repo.var)
1+ DOCKERHUB_REPO := taccwma/core-cms
22DOCKER_TAG ?= $(shell git rev-parse --short HEAD)
33DOCKER_IMAGE := $(DOCKERHUB_REPO ) :$(DOCKER_TAG )
44DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO ) :latest
@@ -9,7 +9,6 @@ DOCKER_COMPOSE_CMD := $(shell if command -v docker-compose > /dev/null; then ech
99# NOTE: Special characters in `DOCKER_IMAGE_BRANCH` are replaced with dashes.
1010DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO ) :$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD | sed 's/[^[:alnum:]\.\_\-]/-/g')
1111
12- NEEDS_DEMO := $(shell cat ./needs_demo.var)
1312BUILD_ID := $(shell git describe --always)
1413
1514.PHONY : build
@@ -21,7 +20,6 @@ build-full:
2120 docker build -t $(DOCKER_IMAGE ) \
2221 --target production \
2322 --build-arg BUILD_ID=" $( BUILD_ID) " \
24- --build-arg NEEDS_DEMO=" $( NEEDS_DEMO) " \
2523 -f ./Dockerfile .
2624
2725 docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH)
Original file line number Diff line number Diff line change @@ -103,25 +103,6 @@ for file in settings_custom settings_local secrets; do
103103 fi
104104done
105105
106- # Create expected .var files if they don't exist (if enabled)
107- if [ " $CREATE_VAR_FILES " = true ]; then
108- echo -e " ${INF} Setting up .var files...${RST} "
109- if [ ! -f " needs_demo.var" ]; then
110- echo " false" > needs_demo.var
111- echo -e " ${POS} Created needs_demo.var${RST} "
112- else
113- echo -e " ${INF} needs_demo.var already exists${RST} "
114- fi
115- if [ ! -f " docker_repo.var" ]; then
116- echo " core-cms" > docker_repo.var
117- echo -e " ${POS} Created docker_repo.var${RST} "
118- else
119- echo -e " ${INF} docker_repo.var already exists${RST} "
120- fi
121- else
122- echo -e " ${INF} Skipping .var file creation (disabled)${RST} "
123- fi
124-
125106# Build and start Docker containers (from project root)
126107echo -e " ${INF} Building and starting Docker containers...${RST} "
127108cd " $PROJECT_ROOT "
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments