Merge f731b120fd
into 9674beb8a5
This commit is contained in:
commit
4f3197654b
3
14.0/build.sh
Normal file
3
14.0/build.sh
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
docker build -t guikipt/odoo14 .
|
@ -3,7 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ -v PASSWORD_FILE ]; then
|
if [ -v PASSWORD_FILE ]; then
|
||||||
PASSWORD="$(< $PASSWORD_FILE)"
|
PASSWORD="$(<$PASSWORD_FILE)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# set the postgres database host, port, user and password according to the environment
|
# set the postgres database host, port, user and password according to the environment
|
||||||
@ -17,9 +17,9 @@ DB_ARGS=()
|
|||||||
function check_config() {
|
function check_config() {
|
||||||
param="$1"
|
param="$1"
|
||||||
value="$2"
|
value="$2"
|
||||||
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then
|
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC"; then
|
||||||
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
|
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" | cut -d " " -f3 | sed 's/["\n\r]//g')
|
||||||
fi;
|
fi
|
||||||
DB_ARGS+=("--${param}")
|
DB_ARGS+=("--${param}")
|
||||||
DB_ARGS+=("${value}")
|
DB_ARGS+=("${value}")
|
||||||
}
|
}
|
||||||
@ -29,21 +29,22 @@ check_config "db_user" "$USER"
|
|||||||
check_config "db_password" "$PASSWORD"
|
check_config "db_password" "$PASSWORD"
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-- | odoo)
|
-- | odoo)
|
||||||
shift
|
shift
|
||||||
if [[ "$1" == "scaffold" ]] ; then
|
if [[ "$1" == "scaffold" ]]; then
|
||||||
exec odoo "$@"
|
exec odoo "$@"
|
||||||
else
|
else
|
||||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||||
exec odoo "$@" "${DB_ARGS[@]}"
|
exec odoo "$@" "${DB_ARGS[@]}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-*)
|
-*)
|
||||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||||
exec odoo "$@" "${DB_ARGS[@]}"
|
exec odoo "$@" "${DB_ARGS[@]}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
|
3
15.0/build.sh
Normal file
3
15.0/build.sh
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
docker build -t guikipt/odoo15 .
|
@ -3,7 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ -v PASSWORD_FILE ]; then
|
if [ -v PASSWORD_FILE ]; then
|
||||||
PASSWORD="$(< $PASSWORD_FILE)"
|
PASSWORD="$(<$PASSWORD_FILE)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# set the postgres database host, port, user and password according to the environment
|
# set the postgres database host, port, user and password according to the environment
|
||||||
@ -17,9 +17,9 @@ DB_ARGS=()
|
|||||||
function check_config() {
|
function check_config() {
|
||||||
param="$1"
|
param="$1"
|
||||||
value="$2"
|
value="$2"
|
||||||
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then
|
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC"; then
|
||||||
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
|
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" | cut -d " " -f3 | sed 's/["\n\r]//g')
|
||||||
fi;
|
fi
|
||||||
DB_ARGS+=("--${param}")
|
DB_ARGS+=("--${param}")
|
||||||
DB_ARGS+=("${value}")
|
DB_ARGS+=("${value}")
|
||||||
}
|
}
|
||||||
@ -29,21 +29,22 @@ check_config "db_user" "$USER"
|
|||||||
check_config "db_password" "$PASSWORD"
|
check_config "db_password" "$PASSWORD"
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-- | odoo)
|
-- | odoo)
|
||||||
shift
|
shift
|
||||||
if [[ "$1" == "scaffold" ]] ; then
|
if [[ "$1" == "scaffold" ]]; then
|
||||||
exec odoo "$@"
|
exec odoo "$@"
|
||||||
else
|
else
|
||||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||||
exec odoo "$@" "${DB_ARGS[@]}"
|
exec odoo "$@" "${DB_ARGS[@]}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-*)
|
-*)
|
||||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||||
exec odoo "$@" "${DB_ARGS[@]}"
|
exec odoo "$@" "${DB_ARGS[@]}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
|
3
16.0/build.sh
Normal file
3
16.0/build.sh
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
docker build -t guikipt/odoo16 .
|
@ -3,7 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ -v PASSWORD_FILE ]; then
|
if [ -v PASSWORD_FILE ]; then
|
||||||
PASSWORD="$(< $PASSWORD_FILE)"
|
PASSWORD="$(<$PASSWORD_FILE)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# set the postgres database host, port, user and password according to the environment
|
# set the postgres database host, port, user and password according to the environment
|
||||||
@ -17,9 +17,9 @@ DB_ARGS=()
|
|||||||
function check_config() {
|
function check_config() {
|
||||||
param="$1"
|
param="$1"
|
||||||
value="$2"
|
value="$2"
|
||||||
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then
|
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC"; then
|
||||||
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
|
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" | cut -d " " -f3 | sed 's/["\n\r]//g')
|
||||||
fi;
|
fi
|
||||||
DB_ARGS+=("--${param}")
|
DB_ARGS+=("--${param}")
|
||||||
DB_ARGS+=("${value}")
|
DB_ARGS+=("${value}")
|
||||||
}
|
}
|
||||||
@ -29,21 +29,22 @@ check_config "db_user" "$USER"
|
|||||||
check_config "db_password" "$PASSWORD"
|
check_config "db_password" "$PASSWORD"
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-- | odoo)
|
-- | odoo)
|
||||||
shift
|
shift
|
||||||
if [[ "$1" == "scaffold" ]] ; then
|
if [[ "$1" == "scaffold" ]]; then
|
||||||
exec odoo "$@"
|
exec odoo "$@"
|
||||||
else
|
else
|
||||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||||
exec odoo "$@" "${DB_ARGS[@]}"
|
exec odoo "$@" "${DB_ARGS[@]}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-*)
|
-*)
|
||||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||||
exec odoo "$@" "${DB_ARGS[@]}"
|
exec odoo "$@" "${DB_ARGS[@]}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
About this Repo
|
Customized Odoo Dockerfile for GuikiPT Projects
|
||||||
======
|
======
|
||||||
|
|
||||||
This is the Git repo of the official Docker image for [Odoo](https://registry.hub.docker.com/_/odoo/). See the Hub page for the full readme on how to use the Docker image and for information regarding contributing and issues.
|
This is the Git repo of the official Docker image for [Odoo](https://registry.hub.docker.com/_/odoo/). See the Hub page for the full readme on how to use the Docker image and for information regarding contributing and issues.
|
||||||
|
Loading…
Reference in New Issue
Block a user