Latest
This commit is contained in:
parent
64b1c9331b
commit
b469e9fd71
2 changed files with 4 additions and 10 deletions
|
@ -45,21 +45,17 @@ decryptionFailure() {
|
||||||
|
|
||||||
### Install Age via Homebrew if not present
|
### Install Age via Homebrew if not present
|
||||||
installAge() {
|
installAge() {
|
||||||
if ! command -v brew > /dev/null; then
|
if ! command -v age > /dev/null; then
|
||||||
logg info 'Running `brew install age`'
|
logg info 'Running `brew install age`'
|
||||||
brew install age
|
brew install age
|
||||||
else
|
|
||||||
logg warn '`age` is not installed which is utilized in the decryption process'
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
### Install Expect via Homebrew if not present
|
### Install Expect via Homebrew if not present
|
||||||
installExpect() {
|
installExpect() {
|
||||||
if ! command -v brew > /dev/null; then
|
if ! command -v expect > /dev/null; then
|
||||||
logg info 'Running `brew install expect`'
|
logg info 'Running `brew install expect`'
|
||||||
brew install expect
|
brew install expect
|
||||||
else
|
|
||||||
logg warn '`expect` is not installed which is utilized in the decryption process'
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,7 +98,7 @@ elif [ -n "$HEADLESS_INSTALL" ] && [ -n "$AGE_PASSWORD" ]; then
|
||||||
installAge
|
installAge
|
||||||
decryptKey
|
decryptKey
|
||||||
else
|
else
|
||||||
logg info 'Skipping Age key decryption process'
|
logg info 'Skipping Age key decryption process - `HEADLESS_INSTALL` and `AGE_PASSWORD` should be passed in as env variables to automate the process'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### Ensure proper permissions on private key
|
### Ensure proper permissions on private key
|
||||||
|
|
|
@ -21,8 +21,6 @@ if [ -d /Applications ] && [ -d /System ]; then
|
||||||
if [ ! -d /Applications/Docker.app ]; then
|
if [ ! -d /Applications/Docker.app ]; then
|
||||||
logg info 'Installing Docker on macOS via Homebrew cask'
|
logg info 'Installing Docker on macOS via Homebrew cask'
|
||||||
brew install --cask docker
|
brew install --cask docker
|
||||||
logg info 'Installing Docker Credential Helper'
|
|
||||||
brew install docker-credential-helper
|
|
||||||
logg info 'Removing Docker.app quarantine status'
|
logg info 'Removing Docker.app quarantine status'
|
||||||
sudo xattr -r -d com.apple.quarantine /Applications/Docker.app
|
sudo xattr -r -d com.apple.quarantine /Applications/Docker.app
|
||||||
else
|
else
|
||||||
|
@ -163,7 +161,7 @@ if [ ! -d /Applications ] || [ ! -d /System ]; then
|
||||||
if ! command -v docker-credential-secretservice > /dev/null; then
|
if ! command -v docker-credential-secretservice > /dev/null; then
|
||||||
installCredentialSecretService
|
installCredentialSecretService
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v runsc > /dev/null; then
|
if ! command -v runsc > /dev/null; then
|
||||||
# Install gVisor
|
# Install gVisor
|
||||||
gVisorPreBuilt || PRE_BUILT_EXIT_CODE=$?
|
gVisorPreBuilt || PRE_BUILT_EXIT_CODE=$?
|
||||||
|
|
Loading…
Reference in a new issue