Commit 953f3203 authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop'

parents e0397fbb 04c41c98
# Set TZDATA timezone
TZ=Europe/Madrid
# MySQL Database config variables
# If you change password remember update dockerfy/dockers/back/ravada.conf
MYSQL_DATABASE=ravada
......
......@@ -4,7 +4,6 @@ services:
container_name: ravada-mysql
volumes:
- "/opt/ravada/mysql:/var/lib/mysql"
#- "/etc/localtime:/etc/localtime:ro"
- "/opt/ravada/log:/var/log/mysql"
networks:
- ravada_network
......@@ -16,8 +15,6 @@ services:
ravada-front:
container_name: ravada-front
volumes:
#- "/etc/timezone:/etc/timezone:ro"
#- "/etc/localtime:/etc/localtime:ro"
- "~/src/ravada:/ravada"
- "/opt/ravada/screenshots:/var/www/img/screenshots"
ports:
......@@ -27,9 +24,9 @@ services:
networks:
- ravada_network
#By default download from dockerhub
#image: ravada/front
image: ravada/front
#If you want to local build
build: dockers/front/.
#build: dockers/front/.
restart: unless-stopped
depends_on:
......@@ -43,8 +40,6 @@ services:
- "/opt/ravada/images:/var/lib/libvirt/images"
- "/opt/ravada/screenshots:/var/www/img/screenshots"
- "/opt/ravada/etc:/etc/libvirt/qemu"
#- "/etc/timezone:/etc/timezone:ro"
#- "/etc/localtime:/etc/localtime:ro"
- "~/src/ravada:/ravada"
ports:
#- "5900-5938:5900-5938"
......@@ -54,9 +49,9 @@ services:
networks:
- ravada_network
#By default download from dockerhub
#image: ravada/back
image: ravada/back
#If you want to local build
build: dockers/back/.
#build: dockers/back/.
privileged: true
restart: unless-stopped
......
......@@ -13,12 +13,12 @@ RUN apt-get update \
libfile-rsync-perl libdate-calc-perl libparallel-forkmanager-perl libdatetime-perl libencode-locale-perl netcat-openbsd \
liblwp-useragent-determined-perl libvirt-clients supervisor net-tools openssh-client apt-utils curl libpbkdf2-tiny-perl \
libio-stringy-perl libvirt-daemon-system libvirt-clients netcat-openbsd qemu-kvm qemu-utils iproute2 wget bridge-utils firewalld dnsmasq iptables ebtables \
libnet-openssh-perl libdatetime-format-dateparse-perl \
libnet-openssh-perl libdatetime-format-dateparse-perl file\
&& apt-get clean
ENV TZ=Europe/Madrid
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata \
&& rm -rf /var/lib/apt/lists/*
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN echo "listen_tls = 0" >> /etc/libvirt/libvirtd.conf \
&& echo 'listen_tcp = 1' >> /etc/libvirt/libvirtd.conf \
......
......@@ -15,7 +15,6 @@ RUN apt-get update \
curl bash vim wget libnet-openssh-perl libdatetime-format-dateparse-perl \
&& apt-get clean
ENV TZ=Europe/Madrid
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata \
&& rm -rf /var/lib/apt/lists/*
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment