Merge pull request #19 from ERPLibre/fix_docker_url_git

Fix docker url git

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
+[Unreleased]: https://github.com/ERPLibre/ERPLibre/compare/v1.0.1...HEAD
-[1.0.1]: http://git.erplibre.ca/ERPLibre/compare/v1.0.0...v1.0.1
+[1.0.1]: https://github.com/ERPLibre/ERPLibre/compare/v1.0.0...v1.0.1
-[1.0.0]: http://git.erplibre.ca/ERPLibre/compare/v0.1.1...v1.0.0
+[1.0.0]: https://github.com/ERPLibre/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.1]: https://github.com/ERPLibre/ERPLibre/compare/v0.1.0...v0.1.1
-[0.1.0]: http://git.erplibre.ca/ERPLibre/releases/tag/v0.1.0
+[0.1.0]: https://github.com/ERPLibre/ERPLibre/releases/tag/v0.1.0

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

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
 ```
 

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
 ```
 

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

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

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}"

manifest/default.dev.xml

@@ -79,7 +79,7 @@
   <project name="margin-analysis.git" path="addons/OCA_margin-analysis" remote="OCA" revision="12.0_sale_margin_editor" groups="addons"/>
   <project name="medical-fhir.git" path="addons/tegin_medical-fhir" remote="tegin" groups="addons"/>
   <project name="mis-builder.git" path="addons/OCA_mis-builder" remote="OCA" groups="addons"/>
-  <project name="muk_base.git" path="addons/muk-it_muk_base" remote="muk-it" groups="addons"/>
+  <project name="muk_base.git" path="addons/muk-it_muk_base" remote="muk-it" revision="12.0_dev" groups="addons"/>
   <project name="muk_dms.git" path="addons/muk-it_muk_dms" remote="muk-it" groups="addons"/>
   <project name="muk_docs.git" path="addons/muk-it_muk_docs" remote="muk-it" groups="addons"/>
   <project name="muk_misc.git" path="addons/muk-it_muk_misc" remote="muk-it" groups="addons"/>

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}
 

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

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