Skip to content

Commit

Permalink
fixes for from-zero building
Browse files Browse the repository at this point in the history
  • Loading branch information
lrvick committed Dec 22, 2020
1 parent 3906212 commit 778c6f9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 25 deletions.
22 changes: 0 additions & 22 deletions images/stack-base/Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion images/stack-base/files/usr/local/bin/host-env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ uid=${UID?}
gid=${GID?}
user=${USER:-"build"}
export HOME="/home/${user}"
export PATH="/home/${user}/.local/bin:$PATH"
export PATH="/home/${user}/.local/bin:/home/${user}/tools:$PATH"

groupdel docker
userdel "${user}" >/dev/null 2>&1 ||:
Expand Down
4 changes: 2 additions & 2 deletions make/stack-local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ ifeq ($(shell docker ps | grep "registry.localhost" >/dev/null; echo $$?),1)
$(REGISTRY)/registry
endif

.PHONY: registry-push
registry-push: registry images/stack-shell.tar images/nginx.tar images/gitea.tar
.PHONY: registry-push images/stack-shell.tar
registry-push: registry images/stack-shell.tar images/nginx.tar images/gitea.tar images/postgrest.tar images/postgres.tar
$(contain) bash -c " \
docker load -i images/stack-base.tar && docker push $(REGISTRY)/stack-base; \
docker load -i images/nginx.tar && docker push $(REGISTRY)/nginx; \
Expand Down

0 comments on commit 778c6f9

Please sign in to comment.