[FIX] docker script: support docker name with - and _
This commit is contained in:
parent
81c4528b57
commit
69733c3941
5 changed files with 44 additions and 5 deletions
|
|
@ -7,4 +7,9 @@ BASENAME="${BASENAME//./}"
|
||||||
# Lowercase
|
# Lowercase
|
||||||
BASENAME="${BASENAME,,}"
|
BASENAME="${BASENAME,,}"
|
||||||
|
|
||||||
docker exec -u root -ti ${BASENAME}_ERPLibre_1 bash
|
docker exec -u root -ti ${BASENAME}-ERPLibre-1 bash
|
||||||
|
|
||||||
|
retVal=$?
|
||||||
|
if [[ $retVal -ne 0 ]]; then
|
||||||
|
docker exec -u root -ti ${BASENAME}_ERPLibre_1 bash
|
||||||
|
fi
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,15 @@ BASENAME="${BASENAME//./}"
|
||||||
# Lowercase
|
# Lowercase
|
||||||
BASENAME="${BASENAME,,}"
|
BASENAME="${BASENAME,,}"
|
||||||
|
|
||||||
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
|
||||||
cd /ERPLibre; \
|
cd /ERPLibre; \
|
||||||
./docker/repo_manifest_gen_org_prefix_path.py /ERPLibre/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf; \
|
./docker/repo_manifest_gen_org_prefix_path.py /ERPLibre/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf; \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
retVal=$?
|
||||||
|
if [[ $retVal -ne 0 ]]; then
|
||||||
|
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
||||||
|
cd /ERPLibre; \
|
||||||
|
./docker/repo_manifest_gen_org_prefix_path.py /ERPLibre/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf; \
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
@ -7,7 +7,15 @@ BASENAME="${BASENAME//./}"
|
||||||
# Lowercase
|
# Lowercase
|
||||||
BASENAME="${BASENAME,,}"
|
BASENAME="${BASENAME,,}"
|
||||||
|
|
||||||
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
|
||||||
cd /ERPLibre; \
|
cd /ERPLibre; \
|
||||||
time make db_list; \
|
time make db_list; \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
retVal=$?
|
||||||
|
if [[ $retVal -ne 0 ]]; then
|
||||||
|
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
||||||
|
cd /ERPLibre; \
|
||||||
|
time make db_list; \
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,15 @@ BASENAME="${BASENAME//./}"
|
||||||
# Lowercase
|
# Lowercase
|
||||||
BASENAME="${BASENAME,,}"
|
BASENAME="${BASENAME,,}"
|
||||||
|
|
||||||
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
|
||||||
cd /ERPLibre; \
|
cd /ERPLibre; \
|
||||||
time make test; \
|
time make test; \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
retVal=$?
|
||||||
|
if [[ $retVal -ne 0 ]]; then
|
||||||
|
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
||||||
|
cd /ERPLibre; \
|
||||||
|
time make test; \
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,19 @@ BASENAME="${BASENAME//./}"
|
||||||
# Lowercase
|
# Lowercase
|
||||||
BASENAME="${BASENAME,,}"
|
BASENAME="${BASENAME,,}"
|
||||||
|
|
||||||
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
|
||||||
cd /ERPLibre; \
|
cd /ERPLibre; \
|
||||||
./.venv/repo forall -pc 'git status -s'; \
|
./.venv/repo forall -pc 'git status -s'; \
|
||||||
echo ''; \
|
echo ''; \
|
||||||
git status -s; \
|
git status -s; \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
retVal=$?
|
||||||
|
if [[ $retVal -ne 0 ]]; then
|
||||||
|
docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
|
||||||
|
cd /ERPLibre; \
|
||||||
|
./.venv/repo forall -pc 'git status -s'; \
|
||||||
|
echo ''; \
|
||||||
|
git status -s; \
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue