Test_commit of the entrypoint solution with dockerfile

This commit is contained in:
khaliiiiiil 2024-11-24 17:51:27 +01:00
parent 34c9d4c1a1
commit e253c54adb
5 changed files with 52 additions and 19 deletions

13
Dockerfile Normal file
View File

@ -0,0 +1,13 @@
# Use the existing Odoo image as the base
FROM odoo:latest AS odoo-custom
# Copy the entrypoint script into the container
COPY entrypoint_odoo.sh /usr/local/bin/entrypoint_odoo.sh
USER root
# Make the entrypoint script executable
RUN chmod +x /usr/local/bin/entrypoint_odoo.sh
# Set the new entrypoint
ENTRYPOINT ["/usr/local/bin/entrypoint_odoo.sh"]

View File

@ -58,22 +58,37 @@ for container in containers_data.get("containers", []):
# Create the container
try:
container_resource = docker.Container(
container_name,
image=container["image"],
envs=[
f"{key}={value}" for key, value in container.get("envs", {}).items()
] if "envs" in container else [],
ports=[
docker.ContainerPortArgs(
internal=port["internal"],
external=port["external"] + i
) for port in container.get("ports", [])
] if "ports" in container else [],
volumes=volumes_config,
network_mode=network.name if network else None,
command=container.get("command", []),
)
if container["name"] == "odoo": # Special configuration for Odoo
container_resource = docker.Container(
container_name,
image="odoo-custom", # Replace with pre-built image name
envs=[f"{key}={value}" for key, value in container.get("envs", {}).items()],
ports=[
docker.ContainerPortArgs(
internal=port["internal"],
external=port["external"] + i
) for port in container.get("ports", [])
] if "ports" in container else [],
volumes=volumes_config,
network_mode=network.name if network else None,
)
else:
container_resource = docker.Container(
container_name,
image=container["image"],
envs=[
f"{key}={value}" for key, value in container.get("envs", {}).items()
] if "envs" in container else [],
ports=[
docker.ContainerPortArgs(
internal=port["internal"],
external=port["external"] + i
) for port in container.get("ports", [])
] if "ports" in container else [],
volumes=volumes_config,
network_mode=network.name if network else None,
command=container.get("command", []),
)
ports = container.get("ports", [])
if ports:
for port in ports:

View File

@ -27,8 +27,7 @@
"ODOO_PASSWORD": "admin"
},
"ports": [{"internal": 8069, "external": 8069}],
"instances": 3,
"command": ["/bin/bash", "-c", "sleep 10 && odoo -i base"]
"instances": 3
},
{
"name": "grafana",

6
entrypoint_backup.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/bash
set -c
apk add --no-cache postgresql-client
sleep 5