From f9016e306b9fc6ce40b5bd5eaf38a8bb4b51e8ac Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Wed, 11 Dec 2019 18:57:23 +0100 Subject: [PATCH] new: windows install will install charm-store Signed-off-by: Valentin Lab --- README.org | 11 ++++++++++- src/install.sh | 30 ++++++++++++++++++------------ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/README.org b/README.org index 955c967..15008ae 100644 --- a/README.org +++ b/README.org @@ -94,9 +94,16 @@ our tool =compose= for the moment. However you can use the full blown - =docker= >= 17.06 - =docker-compose= -**** TODO Deployment +**** Deployment + +You'll need to get our charms if you want to use our same postgres +image. +This script will take care of what you need: +#+BEGIN_SRC shell +curl -sS https://git.myceliandre.fr/Lokavaluto/dev-pack/raw/branch/dev/src/install.sh | bash +#+END_SRC ** Usage @@ -169,6 +176,8 @@ cat < docker-compose.yml version: '2.0' services: odoo: + ports: + - 8069:8069 command: - odoo - --config=/opt/odoo/auto/odoo.conf diff --git a/src/install.sh b/src/install.sh index f4e77d0..7430b3e 100644 --- a/src/install.sh +++ b/src/install.sh @@ -200,6 +200,21 @@ install_file() { rm -f "$tmpfile" } +get_charm_store() { + if ! [ -d "$CHARM_PATH" ]; then + echo "Creating charm-store in '$CHARM_PATH'." + git clone https://git.0k.io/0k-charms.git "$CHARM_PATH" || exit 1 + else + echo "Updating existing charm-store in '$CHARM_PATH'." + cd "$CHARM_PATH" || exit 1 + git checkout master && + git pull -r || { + warn "Could not update charm-store, do you have devs ingoing ?" + } + fi +} + + install.linux() { depends docker curl git @@ -245,17 +260,7 @@ install.linux() { fi ## CHARMS - if ! [ -d "$CHARM_PATH" ]; then - echo "Creating charm-store in '$CHARM_PATH'." - git clone https://git.0k.io/0k-charms.git "$CHARM_PATH" || exit 1 - else - echo "Updating existing charm-store in '$CHARM_PATH'." - cd "$CHARM_PATH" || exit 1 - git checkout master && - git pull -r || { - warn "Could not update charm-store, do you have devs ingoing ?" - } - fi + get_charm_store || exit 1 ## ## YYYvlab: following needs to be discussed further with njeudy @@ -306,7 +311,8 @@ install.mac() { } install.wsl() { - die "Not implemented yet." + CHARM_PATH=~/.charm-store + get_charm_store || return 1 }