From eeafbcdecb37da59052775506b9f505c23f6a624 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 21 Jan 2021 01:52:54 -0500 Subject: [PATCH 1/3] [FIX] remove git submodule init and improve FAQ networking --- doc/FAQ.md | 8 ++++++++ script/install_locally.sh | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 570269e..1d69a77 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -4,6 +4,14 @@ Show all open port ```bash sudo lsof -i -P -n | grep LISTEN ``` +or +```bash +sudo netstat -lpnt | grep LISTEN +``` +or +```bash +sudo ss -lpnt | grep LISTEN +``` ## git-repo ### error.GitError fatal bad revision diff --git a/script/install_locally.sh b/script/install_locally.sh index 1acaa6f..9a5387b 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -168,8 +168,8 @@ if [[ ${EL_INSTALL_NGINX} = "True" ]]; then printf "proxy_mode = True\n" >> ${EL_CONFIG_FILE} fi -echo -e "\n---- Install Odoo with addons module ----" -git submodule update --init +#echo -e "\n---- Install Odoo with addons module ----" +#git submodule update --init # Generate empty addons if missing if [[ ! -d "./addons/addons" ]]; then From e648095168d25a7856b3697c9c8dc3aeaa844110 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 21 Jan 2021 01:52:23 -0500 Subject: [PATCH 2/3] [ADD] makefile script install docker debian 10 and ubuntu - use docker for production --- Makefile | 13 ++++++++ script/install_debian_10_prod_docker.sh | 41 +++++++++++++++++++++++++ script/install_ubuntu_docker.sh | 40 ++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100755 script/install_debian_10_prod_docker.sh create mode 100755 script/install_ubuntu_docker.sh diff --git a/Makefile b/Makefile index e985871..ac9b492 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,19 @@ run_code_generator: install_dev: ./script/install_locally_dev.sh +# Install this for the first time of dev environment +.PHONY: install_os +install_os: + ./script/install_dev.sh + +.PHONY: install_docker_debian +install_docker_debian: + ./script/ install_debian_10_prod_docker.sh + +.PHONY: install_docker_ubuntu +install_docker_ubuntu: + ./script/install_ubuntu_docker.sh + ##################### # DB installation # ##################### diff --git a/script/install_debian_10_prod_docker.sh b/script/install_debian_10_prod_docker.sh new file mode 100755 index 0000000..4ffab36 --- /dev/null +++ b/script/install_debian_10_prod_docker.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# https://docs.docker.com/engine/install/debian/ +# Docker +sudo apt-get update +sudo apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg-agent \ + software-properties-common + +curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - +sudo apt-key fingerprint 0EBFCD88 +sudo add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/debian \ + $(lsb_release -cs) \ + stable" + +sudo apt-get update +sudo apt-get install -y docker-ce docker-ce-cli containerd.io +docker --version + +# Docker-compose +sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +sudo chmod +x /usr/local/bin/docker-compose +docker-compose --version + +# nginx +sudo apt-get install -y nginx + +# Snap installation +# https://snapcraft.io/docs/installing-snap-on-debian +sudo apt install -y snapd +sudo snap install core +sudo snap refresh core + +# https://certbot.eff.org/lets-encrypt/debianbuster-nginx +# Cerbot +sudo snap install --classic certbot +sudo ln -s /snap/bin/certbot /usr/bin/certbot diff --git a/script/install_ubuntu_docker.sh b/script/install_ubuntu_docker.sh new file mode 100755 index 0000000..71f5063 --- /dev/null +++ b/script/install_ubuntu_docker.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +# From https://docs.docker.com/engine/install/ubuntu/ +sudo apt-get update +sudo apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg-agent \ + software-properties-common +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo apt-key fingerprint 0EBFCD88 + +sudo add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" + +sudo apt-get update +sudo apt-get install docker-ce docker-ce-cli containerd.io +docker --version + +# Docker-compose +sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +sudo chmod +x /usr/local/bin/docker-compose +docker-compose --version + +# nginx +sudo apt-get install -y nginx + +# Snap installation +# https://snapcraft.io/docs/installing-snap-on-debian +sudo apt install -y snapd +sudo snap install core +sudo snap refresh core + +# https://certbot.eff.org/lets-encrypt/debianbuster-nginx +# Cerbot +sudo snap install --classic certbot +sudo ln -s /snap/bin/certbot /usr/bin/certbot From f971cd1efcc0c51b1210cdca5c8fa5cc9bb51b32 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 22 Jan 2021 20:40:16 -0500 Subject: [PATCH 3/3] [ADD] makefile addons_reinstall_code_generator_demo --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ac9b492..da64059 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,9 @@ addons_install_code_generator_demo: addons_uninstall_code_generator_demo: ./run.sh --no-http --stop-after-init -d code_generator --uninstall code_generator_demo +.PHONY: addons_reinstall_code_generator_demo +addons_reinstall_code_generator_demo: addons_uninstall_code_generator_demo addons_install_code_generator_demo + .PHONY: addons_install_all_code_generator_demo addons_install_all_code_generator_demo: ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo -u code_generator_demo