ss/sovereign-stack
ss/sovereign-stack
1
1
Fork 1
Code Releases Activity

Update env sourcing.

Browse Source
This commit is contained in:
Derek Smith 2023-04-12 10:07:41 -04:00
parent 0d8ece8362
commit bccef77d4e
Signed by: farscapian
GPG Key ID: B443E530A14E1C90
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/remote.sh
View File

@ -18,8 +18,9 @@ if [ -z "$REMOTE_NAME" ]; then
exit 1 exit 1
fi fi
#shellcheck disable=SC1091 . ./deployment_defaults.sh
source ./deployment_defaults.sh
. ./base.sh
export REMOTE_PATH="$REMOTES_PATH/$REMOTE_NAME" export REMOTE_PATH="$REMOTES_PATH/$REMOTE_NAME"
REMOTE_DEFINITION="$REMOTE_PATH/remote.conf" REMOTE_DEFINITION="$REMOTE_PATH/remote.conf"

2
deployment/stub_lxc_profile.sh
View File

@ -75,6 +75,8 @@ EOF
fi fi
. ./target.sh
# if VIRTUAL_MACHINE=base, then we doing the base image. # if VIRTUAL_MACHINE=base, then we doing the base image.
if [ "$VIRTUAL_MACHINE" = base ]; then if [ "$VIRTUAL_MACHINE" = base ]; then
# this is for the base image only... # this is for the base image only...

3
deployment/up.sh
View File

@ -3,8 +3,7 @@
set -eu set -eu
cd "$(dirname "$0")" cd "$(dirname "$0")"
LATEST_GIT_COMMIT="$(cat ./project/.git/refs/heads/main)" . ./target.sh
export LATEST_GIT_COMMIT="$LATEST_GIT_COMMIT"
# check to ensure dependencies are met. # check to ensure dependencies are met.
for cmd in wait-for-it dig rsync sshfs lxc; do for cmd in wait-for-it dig rsync sshfs lxc; do

2
deployment/update.sh
View File

@ -3,7 +3,7 @@
set -eu set -eu
cd "$(dirname "$0")" cd "$(dirname "$0")"
TARGET_PROJECT_GIT_COMMIT=2e68e93303196fd57b1b473b149b5a82c9faa4f0 . ./target.sh
# # As part of the install script, we pull down any other sovereign-stack git repos # # As part of the install script, we pull down any other sovereign-stack git repos
# PROJECTS_SCRIPTS_REPO_URL="https://git.sovereign-stack.org/ss/project" # PROJECTS_SCRIPTS_REPO_URL="https://git.sovereign-stack.org/ss/project"

5
install.sh
View File

@ -59,6 +59,11 @@ EOF
fi fi
. ./deployment/deployment_defaults.sh
. ./deployment/base.sh
# we need to get the base image. IMport it if it's cached, else download it then cache it. # we need to get the base image. IMport it if it's cached, else download it then cache it.
if ! lxc image list | grep -q "$UBUNTU_BASE_IMAGE_NAME"; then if ! lxc image list | grep -q "$UBUNTU_BASE_IMAGE_NAME"; then