From f81b257e3abcdb105f8ccdc02b03cb84eec1a094 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 20 Nov 2020 23:22:28 -0500 Subject: [PATCH 1/4] [FIX] rename http://git.erplibre.ca/ to https://github.com/ERPlibre/ --- CHANGELOG.md | 10 +++++----- README.md | 2 +- doc/GIT_REPO.md | 4 ++-- doc/PRODUCTION.md | 2 +- docker/Dockerfile.prod.pkg | 2 +- script/update_manifest_dev.sh | 2 +- script/update_manifest_prod.sh | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd23a9d..156ff5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,8 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Support only python3.6 and python3.7, python3.8 causes error in runtime. -[Unreleased]: http://git.erplibre.ca/ERPLibre/compare/v1.0.1...HEAD -[1.0.1]: http://git.erplibre.ca/ERPLibre/compare/v1.0.0...v1.0.1 -[1.0.0]: http://git.erplibre.ca/ERPLibre/compare/v0.1.1...v1.0.0 -[0.1.1]: http://git.erplibre.ca/ERPLibre/compare/v0.1.0...v0.1.1 -[0.1.0]: http://git.erplibre.ca/ERPLibre/releases/tag/v0.1.0 +[Unreleased]: https://github.com/ERPLibre/ERPLibre/compare/v1.0.1...HEAD +[1.0.1]: https://github.com/ERPLibre/ERPLibre/compare/v1.0.0...v1.0.1 +[1.0.0]: https://github.com/ERPLibre/ERPLibre/compare/v0.1.1...v1.0.0 +[0.1.1]: https://github.com/ERPLibre/ERPLibre/compare/v0.1.0...v0.1.1 +[0.1.0]: https://github.com/ERPLibre/ERPLibre/releases/tag/v0.1.0 diff --git a/README.md b/README.md index 518b7c3..8f0ea32 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Select a guide to install your environment! ## Easy way to run locally Clone the project ```bash -git clone http://git.erplibre.ca/ERPLibre.git +git clone https://github.com/ERPLibre/ERPLibre.git cd ERPLibre ``` Support Ubuntu 18.04 and OSX diff --git a/doc/GIT_REPO.md b/doc/GIT_REPO.md index 3a7f55f..23d9660 100644 --- a/doc/GIT_REPO.md +++ b/doc/GIT_REPO.md @@ -10,13 +10,13 @@ curl https://storage.googleapis.com/git-repo-downloads/repo > ./.venv/repo ## prod ```bash -./.venv/repo init -u http://git.erplibre.ca/ERPLibre -b master +./.venv/repo init -u https://github.com/ERPLibre/ERPLibre -b master ./.venv/repo sync ``` ## dev ```bash -./.venv/repo init -u http://git.erplibre.ca/ERPLibre -b 12.0_repo -m ./manifest/default.dev.xml +./.venv/repo init -u https://github.com/ERPLibre/ERPLibre -b 12.0_repo -m ./manifest/default.dev.xml ./.venv/repo sync ``` diff --git a/doc/PRODUCTION.md b/doc/PRODUCTION.md index 133ebc9..b2480e8 100644 --- a/doc/PRODUCTION.md +++ b/doc/PRODUCTION.md @@ -4,7 +4,7 @@ ### 1. Clone the project: ```bash -git clone http://git.erplibre.ca/ERPLibre.git +git clone https://github.com/ERPLibre/ERPLibre.git cd ERPLibre ``` diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index 4334e1d..58f9e73 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -1,6 +1,6 @@ FROM technolibre/erplibre-base:1.1.0 -ENV REPO_MANIFEST_URL http://git.erplibre.ca/ERPLibre +ENV REPO_MANIFEST_URL https://github.com/ERPLibre/ERPLibre ARG WORKING_BRANCH ARG WORKING_HASH ENV BRANCH_ERPLIBRE $WORKING_BRANCH diff --git a/script/update_manifest_dev.sh b/script/update_manifest_dev.sh index 12d75a4..e1804b6 100755 --- a/script/update_manifest_dev.sh +++ b/script/update_manifest_dev.sh @@ -6,6 +6,6 @@ #EL_MANIFEST_DEV="./manifest/default.dev.xml" # Update git-repo -./.venv/repo init -u http://git.erplibre.ca/ERPLibre -b $(git rev-parse --verify HEAD) -m ${EL_MANIFEST_DEV} +./.venv/repo init -u https://github.com/ERPLibre/ERPLibre -b $(git rev-parse --verify HEAD) -m ${EL_MANIFEST_DEV} #./.venv/repo sync --force-sync ./.venv/repo sync --force-sync -v diff --git a/script/update_manifest_prod.sh b/script/update_manifest_prod.sh index b9f5ba0..f79b6ec 100755 --- a/script/update_manifest_prod.sh +++ b/script/update_manifest_prod.sh @@ -6,6 +6,6 @@ #EL_MANIFEST_DEV="./manifest/default.dev.xml" # Update git-repo -./.venv/repo init -u http://git.erplibre.ca/ERPLibre -b $(git rev-parse --verify HEAD) +./.venv/repo init -u https://github.com/ERPLibre/ERPLibre -b $(git rev-parse --verify HEAD) #./.venv/repo sync --force-sync ./.venv/repo sync -v From 0615f573d459383a4849ec2081f6165ffa2e1f6d Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 21 Nov 2020 00:10:55 -0500 Subject: [PATCH 2/4] [ADD] docker_build with release - when docker build without release, add hash of commit in version --- env_var.sh | 4 ---- script/docker_build.sh | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/env_var.sh b/env_var.sh index 1979a9e..d7111c6 100755 --- a/env_var.sh +++ b/env_var.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash ERPLIBRE_VERSION="1.1.0" -ERPLIBRE_DOCKER_BASE="technolibre/erplibre-base" -ERPLIBRE_DOCKER_PROD="technolibre/erplibre" -ERPLIBRE_DOCKER_BASE_VERSION="${ERPLIBRE_DOCKER_BASE}:${ERPLIBRE_VERSION}" -ERPLIBRE_DOCKER_PROD_VERSION="${ERPLIBRE_DOCKER_PROD}:${ERPLIBRE_VERSION}" EL_USER="erplibre" EL_HOME="/${EL_USER}" diff --git a/script/docker_build.sh b/script/docker_build.sh index cf2bc7e..283bf31 100755 --- a/script/docker_build.sh +++ b/script/docker_build.sh @@ -2,15 +2,32 @@ . ./env_var.sh ARGS="" +IS_RELEASE=false +ERPLIBRE_DOCKER_BASE="technolibre/erplibre-base" +ERPLIBRE_DOCKER_PROD="technolibre/erplibre" for arg in "$@" do if [ "$arg" == "--no-cache" ] then ARGS="${ARGS} --no-cache" + elif [ "$arg" == "--release" ] + then + IS_RELEASE=true fi done +if [ "$IS_RELEASE" == false ] +then + # Add commit hash when not a release + ERPLIBRE_VERSION="${ERPLIBRE_VERSION}_$(git rev-parse --short HEAD)" +fi + +ERPLIBRE_DOCKER_BASE_VERSION="${ERPLIBRE_DOCKER_BASE}:${ERPLIBRE_VERSION}" +ERPLIBRE_DOCKER_PROD_VERSION="${ERPLIBRE_DOCKER_PROD}:${ERPLIBRE_VERSION}" + +echo "Create docker ${ERPLIBRE_DOCKER_PROD_VERSION}" + # Rewrite docker-compose ./script/docker_update_version.py --version=${ERPLIBRE_VERSION} --base=${ERPLIBRE_DOCKER_BASE} --prod=${ERPLIBRE_DOCKER_PROD} From f55fa9f330fdb0d40d39278e4251ea5114336c95 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 20 Nov 2020 23:54:44 -0500 Subject: [PATCH 3/4] [ADD] doc to create a release docker --- doc/RELEASE.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/RELEASE.md b/doc/RELEASE.md index 40e5017..3c43935 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -31,7 +31,14 @@ git push --tags ``` ## Push docker -[Build and push guide](../docker/README.md) at section `# Update docker`. +When building your docker with script +> ./script/docker_build.sh --release + +List your docker version +> docker image + +You need to push your docker image and update your tag, like 1.0.1: +> docker push technolibre/erplibre:VERSION # TIPS ## Compare repo differences with another ERPLibre project From a096325984a98bde01b6c70b84b135649de1934d Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 20 Nov 2020 23:54:59 -0500 Subject: [PATCH 4/4] [UPD] muk_base with erplibre signature --- manifest/default.dev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/default.dev.xml b/manifest/default.dev.xml index 1e9c248..c1bb70d 100644 --- a/manifest/default.dev.xml +++ b/manifest/default.dev.xml @@ -79,7 +79,7 @@ - +