Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker apache config port #2847

Merged
merged 2 commits into from
Aug 25, 2024
Merged

Conversation

stakovicz
Copy link
Contributor

@stakovicz stakovicz commented Aug 24, 2024

Cette PR permet de spécifier le port de fonctionnement d'apache2 via la variable d'environnement APACHE_PORT lors de l'utilisation via docker + #2630.

Description

Il est parfois utile de pouvoir spécifier le port d'apache dans certain cas.
Par exemple en utilisant le mode host (network_mode: "host") pour le faire fonctionner dans un NAS Synology.

C'est une demande qui a aussi été faite ici : #2630

Il y a 2 commits.
Le plus important : 151633c qui permet de rendre le port dynamique.
Le 2e, une amélioration du code du script d'init pour docker : e95f724

Exemple d'utilisation via docker compose :

services:
  http:
    image: jeedom/jeedom:beta
    volumes:
      - http:/var/www/html
    tmpfs:
      - /tmp/jeedom
    restart: always
    environment:
      - DB_HOST=localhost
      - DB_USERNAME=jeedom
      - DB_PASSWORD=MON_MOT_DE_PASSE_A_CHANGER
      - DB_NAME=jeedom
      - APACHE_PORT=7280	#<-- variable d'env pour le port d'apache
    network_mode: "host"
    healthcheck:
      test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:7280"]
      interval: 30s
      timeout: 10s
      retries: 5
volumes:
  http:

Suggested changelog entry

Docker Apache port config via APACHE_PORT

Related issues/external references

Fixes #
N.C.

Types of changes

  • Bug fix (non-breaking change which fixes)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
    • This change is only breaking for integrators, not for external standards or end-users.
  • Documentation improvement

PR checklist

@stakovicz stakovicz marked this pull request as ready for review August 24, 2024 15:45
@zoic21 zoic21 changed the base branch from beta to alpha August 25, 2024 10:38
@zoic21
Copy link
Contributor

zoic21 commented Aug 25, 2024

Bonjour,
Il faudrait refaire le commit sur la branche ALPHA, j'ai essayé de changer la branche de base mais ya pas mal de conflit...

@stakovicz stakovicz force-pushed the docker-apache-config-port branch from e95f724 to f0982af Compare August 25, 2024 11:30
@stakovicz
Copy link
Contributor Author

Bonjour, voilà, c'est fait

@zoic21 zoic21 merged commit f9eb81e into jeedom:alpha Aug 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants