From 62787c041b08844bcb15b6e30ff1fcff8515597a Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathben@technolibre.ca>
Date: Wed, 30 Jun 2021 22:26:20 -0400
Subject: [PATCH] [UPD] docker: move script in ./script/docker - Fix make
 docker_exec_erplibre

---
 Makefile                                     | 6 +++---
 doc/RELEASE.md                               | 2 +-
 docker/README.md                             | 4 ++--
 script/{ => docker}/docker_build.sh          | 0
 script/docker/docker_exec.sh                 | 6 ++++++
 script/{ => docker}/docker_update_version.py | 0
 6 files changed, 12 insertions(+), 6 deletions(-)
 rename script/{ => docker}/docker_build.sh (100%)
 create mode 100755 script/docker/docker_exec.sh
 rename script/{ => docker}/docker_update_version.py (100%)

diff --git a/Makefile b/Makefile
index 44dcce4..afd5e07 100644
--- a/Makefile
+++ b/Makefile
@@ -305,17 +305,17 @@ docker_show_process:
 
 .PHONY: docker_exec_erplibre
 docker_exec_erplibre:
-	docker exec -u root -ti erplibre_ERPLibre_1 bash
+	./script/docker/docker_exec.sh
 
 # build docker
 .PHONY: docker_build
 docker_build:
-	./script/docker_build.sh
+	./script/docker/docker_build.sh
 
 # build docker release
 .PHONY: docker_build_release
 docker_build_release:
-	./script/docker_build.sh --release
+	./script/docker/docker_build.sh --release
 
 # docker clean all
 .PHONY: docker_clean_all
diff --git a/doc/RELEASE.md b/doc/RELEASE.md
index 9fef491..ff283f3 100644
--- a/doc/RELEASE.md
+++ b/doc/RELEASE.md
@@ -77,7 +77,7 @@ git push --tags
 Important to generate container after push git tags, otherwise the git version will be wrong.
 
 When building your docker with script
-> ./script/docker_build.sh --release
+> make docker_build_release
 
 List your docker version
 > docker images
diff --git a/docker/README.md b/docker/README.md
index f5bc314..8b78e64 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -114,10 +114,10 @@ And restart docker service. You can delete or move all older locations of docker
 
 # Update docker
 When building your docker with script
-> ./script/docker_build.sh
+> make docker_build
 
 List your docker version
-> docker image
+> docker images
 
 You need to push your docker image and update your tag, like 1.0.1:
 > docker push technolibre/erplibre:VERSION
diff --git a/script/docker_build.sh b/script/docker/docker_build.sh
similarity index 100%
rename from script/docker_build.sh
rename to script/docker/docker_build.sh
diff --git a/script/docker/docker_exec.sh b/script/docker/docker_exec.sh
new file mode 100755
index 0000000..31e027e
--- /dev/null
+++ b/script/docker/docker_exec.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+CURRENT=$(pwd)
+BASENAME=$(basename "${CURRENT}")
+
+docker exec -u root -ti ${BASENAME}_ERPLibre_1 bash
diff --git a/script/docker_update_version.py b/script/docker/docker_update_version.py
similarity index 100%
rename from script/docker_update_version.py
rename to script/docker/docker_update_version.py