Skip to content

Commit 5ebbd52

Browse files
committed
Minor - cleanup stray files, submod, plus a hack in the makefile
1 parent 1178789 commit 5ebbd52

File tree

5 files changed

+19
-4843
lines changed

5 files changed

+19
-4843
lines changed

.devcontainer/Makefile

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@ FULLTAG := $(TAG)-$(SLOT)
5555
# Compute dynamic workspace directory name
5656
WORKDIR := /$(REPONAME)-$(REALHOSTNAME)
5757

58+
ifeq ($(SUPERREPO),1)
59+
# Temporary hack to mount the larger workspace:
60+
MOUNTDIR := `pwd`/../..
61+
REPOROOT := $(MOUNTDIR)/happy-fork
62+
else
63+
MOUNTDIR := `pwd`/..
64+
REPOROOT := $(MOUNTDIR)
65+
endif
66+
5867
OS := $(shell uname)
5968

6069
ifeq ($(OS),Darwin)
@@ -78,7 +87,7 @@ build: Dockerfile
7887
run:
7988
$(CONTAINER) run -it --rm -u $(USER) --hostname $(CONTAINER_HOSTNAME) \
8089
-v `pwd`/home:/home/$(USER) \
81-
-v `pwd`/..:$(WORKDIR) \
90+
-v $(MOUNTDIR):$(WORKDIR) \
8291
$(FULLTAG) bash
8392

8493

@@ -91,31 +100,31 @@ PORTS_SERVER= -p 3005:3005
91100
root:
92101
$(CONTAINER) run -it --rm -u root --hostname $(CONTAINER_HOSTNAME) \
93102
-v `pwd`/home:/root \
94-
-v `pwd`/..:$(WORKDIR) \
103+
-v $(MOUNTDIR):$(WORKDIR) \
95104
$(FULLTAG) bash
96105

97106
# All ports forwarded (legacy behavior)
98107
root-all-ports:
99108
$(CONTAINER) run -it --rm -u root --hostname $(CONTAINER_HOSTNAME) \
100109
-v `pwd`/home:/root \
101-
-v `pwd`/..:$(WORKDIR) \
110+
-v $(MOUNTDIR):$(WORKDIR) \
102111
$(PORTS_ALL) $(FULLTAG) bash
103112

104113
# Web client only (port 8081) - starts the webapp directly
105114
web:
106115
$(CONTAINER) run -it --rm -u root --hostname $(CONTAINER_HOSTNAME) \
107116
-v `pwd`/home:/root \
108-
-v `pwd`/..:$(WORKDIR) \
117+
-v $(MOUNTDIR):$(WORKDIR) \
109118
$(PORTS_WEB) $(FULLTAG) \
110-
bash -c "cd $(WORKDIR) && ./happy-launcher.sh start-webapp"
119+
bash -c "cd $(REPOROOT) && ./happy-launcher.sh start-webapp"
111120

112121
# Happy server only (port 3005) - starts the server directly
113122
server:
114123
$(CONTAINER) run -it --rm -u root --hostname $(CONTAINER_HOSTNAME) \
115124
-v `pwd`/home:/root \
116-
-v `pwd`/..:$(WORKDIR) \
125+
-v $(MOUNTDIR):$(WORKDIR) \
117126
$(PORTS_SERVER) $(FULLTAG) \
118-
bash -c "cd $(WORKDIR) && ./happy-launcher.sh start-backend && tail -f /dev/null"
127+
bash -c "cd $(REPOROOT) && ./happy-launcher.sh start-backend && tail -f /dev/null"
119128

120129
AGENT_LAYERS = Dockerfile.claude Dockerfile.copilot
121130
# Dockerfile.gemini
@@ -237,7 +246,7 @@ side-step:
237246

238247
info:
239248
@echo Reponame discovered as $(REPONAME)
240-
@echo Workdir should be $(WORKDIR)
249+
@echo Workdir should be $(WORKDIR), repo root $(REPOROOT)
241250
@echo REALHOSTNAME=$(REALHOSTNAME)
242251
@echo CONTAINER_HOSTNAME=$(CONTAINER_HOSTNAME)
243252

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ package-lock.json
1111

1212
# Symlinks created for backwards compatibility
1313
happy-demo.sh
14+
trash

0 commit comments

Comments
 (0)