framadate : variabilisation des interfaces/ports
This commit is contained in:
parent
117946a695
commit
e8c190581f
|
@ -26,7 +26,10 @@ SMTP_SERVER=${GARBAYE_FRAMADATE_SMTP_SERVER}
|
||||||
|
|
||||||
EOT
|
EOT
|
||||||
|
|
||||||
export GARBAYE_FRAMADATE_FRAMADATE_VERSION="${framadate_release}"
|
export framadate_release
|
||||||
|
export listen_if
|
||||||
|
export listen_port
|
||||||
|
|
||||||
podman-compose up -d
|
podman-compose up -d
|
||||||
shred -u .env
|
shred -u .env
|
||||||
podman rmi $(podman images -a -q -- docker.io/library/composer)
|
podman rmi $(podman images -a -q -- docker.io/library/composer)
|
||||||
|
|
|
@ -18,12 +18,12 @@ services:
|
||||||
dockerfile: ./docker/Dockerfile
|
dockerfile: ./docker/Dockerfile
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
GARBAYE_FRAMADATE_FRAMADATE_VERSION: "$GARBAYE_FRAMADATE_FRAMADATE_VERSION"
|
GARBAYE_FRAMADATE_FRAMADATE_VERSION: "$framadate_release"
|
||||||
image: "framadate-app:${GARBAYE_FRAMADATE_FRAMADATE_VERSION}"
|
image: "framadate-app:${framadate_release}"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:8087:80
|
- ${listen_if}:${listen_port}:80
|
||||||
environment:
|
environment:
|
||||||
- ENV=prod
|
- ENV=prod
|
||||||
- MYSQL_USER=framadate
|
- MYSQL_USER=framadate
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
FROM docker.io/library/php:7-apache
|
FROM docker.io/library/php:7-apache
|
||||||
|
|
||||||
ARG GARBAYE_FRAMADATE_FRAMADATE_VERSION
|
ARG version
|
||||||
|
|
||||||
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zip unzip git zlib1g-dev libicu-dev g++ default-mysql-client git
|
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zip unzip git zlib1g-dev libicu-dev g++ default-mysql-client git
|
||||||
RUN docker-php-ext-install intl && docker-php-ext-install pdo_mysql
|
RUN docker-php-ext-install intl && docker-php-ext-install pdo_mysql
|
||||||
|
@ -21,7 +21,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 0
|
||||||
|
|
||||||
WORKDIR /var/www/framadate
|
WORKDIR /var/www/framadate
|
||||||
|
|
||||||
RUN git clone -b $GARBAYE_FRAMADATE_FRAMADATE_VERSION --depth=1 https://framagit.org/framasoft/framadate/framadate.git .
|
RUN git clone -b $version --depth=1 https://framagit.org/framasoft/framadate/framadate.git .
|
||||||
RUN chown -R 33:33 .
|
RUN chown -R 33:33 .
|
||||||
|
|
||||||
# Some Apache and PHP configuration
|
# Some Apache and PHP configuration
|
||||||
|
|
|
@ -4,10 +4,11 @@ pod_name='podman-framadate'
|
||||||
service_name="pod-${pod_name}.service"
|
service_name="pod-${pod_name}.service"
|
||||||
framadate_release='1.1.19'
|
framadate_release='1.1.19'
|
||||||
dbvolume='podman-framadate_framadate-db'
|
dbvolume='podman-framadate_framadate-db'
|
||||||
|
listen_if="${GARBAYE_FRAMADATE_ENV_LISTENIF:-127.0.0.1}"
|
||||||
|
listen_port="${GARBAYE_FRAMADATE_ENV_LISTENPORT:-8087}"
|
||||||
GARBAYE_FRAMADATE_APP_NAME="${GARBAYE_FRAMADATE_ENV_APP_NAME:-Framadate Garbaye}"
|
GARBAYE_FRAMADATE_APP_NAME="${GARBAYE_FRAMADATE_ENV_APP_NAME:-Framadate Garbaye}"
|
||||||
GARBAYE_FRAMADATE_DOMAIN="${GARBAYE_FRAMADATE_ENV_DOMAIN:-sondage.garbaye.fr}"
|
GARBAYE_FRAMADATE_DOMAIN="${GARBAYE_FRAMADATE_ENV_DOMAIN:-sondage.garbaye.fr}"
|
||||||
GARBAYE_FRAMADATE_ADMIN_MAIL="${GARBAYE_FRAMADATE_ENV_ADMIN_MAIL:-contact-framadate@garbaye.fr}"
|
GARBAYE_FRAMADATE_ADMIN_MAIL="${GARBAYE_FRAMADATE_ENV_ADMIN_MAIL:-contact-framadate@garbaye.fr}"
|
||||||
get_default_iface_ipv4 GARBAYE_FRAMADATE_SMTP_SERVER
|
get_default_iface_ipv4 GARBAYE_FRAMADATE_SMTP_SERVER
|
||||||
GARBAYE_FRAMADATE_FRAMADATE_VERSION=${framadate_version}
|
|
||||||
envvars='GARBAYE_FRAMADATE_ADMIN_PASSWORD GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD GARBAYE_FRAMADATE_MYSQL_PASSWORD'
|
envvars='GARBAYE_FRAMADATE_ADMIN_PASSWORD GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD GARBAYE_FRAMADATE_MYSQL_PASSWORD'
|
||||||
upstream_images='localhost/framadate-app docker.io/library/composer docker.io/library/mysql docker.io/library/php docker.io/library/composer'
|
upstream_images='localhost/framadate-app docker.io/library/composer docker.io/library/mysql docker.io/library/php docker.io/library/composer'
|
||||||
|
|
Loading…
Reference in a new issue