feat: shared components

This commit is contained in:
Timothy Pidashev
2024-03-11 18:17:57 -07:00
parent 56f799266b
commit 8b6a760d91
4 changed files with 9 additions and 13 deletions

View File

@@ -147,9 +147,14 @@ define container_build
$(eval TAG := $(PROJECT_REGISTRY)/$(CONTAINER):$(VERSION)), \ $(eval TAG := $(PROJECT_REGISTRY)/$(CONTAINER):$(VERSION)), \
) )
sudo mount -o bind src/shared src/landing/landing/shared sudo mkdir -p $(call container_location,$(CONTAINER))/$(CONTAINER)/shared
sudo mount -o bind src/shared $(call container_location,$(CONTAINER))/$(CONTAINER)/shared
docker buildx build --load -t $(TAG) -f $(strip $(subst $(SPACE),,$(call container_location,$(CONTAINER))))/Dockerfile.$(ENVIRONMENT) ./$(strip $(subst $(SPACE),,$(call container_location,$(CONTAINER))))/. $(ARGS) $(call labels,$(shell echo $(CONTAINER_NAME) | tr '[:lower:]' '[:upper:]')) --no-cache docker buildx build --load -t $(TAG) -f $(strip $(subst $(SPACE),,$(call container_location,$(CONTAINER))))/Dockerfile.$(ENVIRONMENT) ./$(strip $(subst $(SPACE),,$(call container_location,$(CONTAINER))))/. $(ARGS) $(call labels,$(shell echo $(CONTAINER_NAME) | tr '[:lower:]' '[:upper:]')) --no-cache
sudo umount /src/landing/landing/shared sudo umount -l $(call container_location,$(CONTAINER))/$(CONTAINER)/shared
sleep 1
sudo rm -rf $(call container_location,$(CONTAINER))/$(CONTAINER)/shared
sleep 1
endef endef
define container_location define container_location
@@ -163,11 +168,3 @@ define container_version
$(shell echo $(strip $(strip $(CONTAINER_$(CONTAINER_NAME)_VERSION))) | tr -d '[:space:]'), \ $(shell echo $(strip $(strip $(CONTAINER_$(CONTAINER_NAME)_VERSION))) | tr -d '[:space:]'), \
$(error Version data for container $(1) not found)) $(error Version data for container $(1) not found))
endef endef
define mount_shared
$(sudo mount -o bind src/shared src/landing/landing/shared)
endef
define unmount_shared
$(sudo umount src/shared)
endef

View File

@@ -38,7 +38,6 @@ services:
networks: networks:
- caddy - caddy
networks: networks:
caddy: caddy:
name: caddy name: caddy

View File

@@ -1 +1 @@
reflex==0.4.3 reflex==0.4.4

View File

@@ -1 +1 @@
reflex==0.4.3 reflex==0.4.4