Skip to content

Commit

Permalink
Fix/2078 docker: Some bugs in docker deploy (#2125)
Browse files Browse the repository at this point in the history
* Fix mysql problem (#2078)

- change database image, from Mysql 5.7 to MariaDB 11.4 LTS
- remove version tag it's deprecated

 WARN[0000] /root/src/ravada/dockerfy/docker-compose.yml: the attribute `version` is obsolete, it will be ignored, please remove it to avoid potential confusion

* Fix docker-compose (#2078)

* Fix docker flush

* Fix error ovmf (#2078)
  • Loading branch information
fv3rdugo authored Jan 13, 2025
1 parent a360ccb commit f5622cb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
5 changes: 1 addition & 4 deletions dockerfy/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "2.2"
services:
ravada-mysql:
container_name: ravada-mysql
Expand All @@ -7,7 +6,7 @@ services:
- "/opt/ravada/log:/var/log/mysql"
networks:
- ravada_network
image: mysql:5.7
image: mariadb:11.4
env_file: .env
command: --default-authentication-plugin=mysql_native_password
restart: unless-stopped
Expand All @@ -29,7 +28,6 @@ services:
#If you want to local build
build: dockers/front/.
restart: unless-stopped

depends_on:
- ravada-mysql

Expand All @@ -56,7 +54,6 @@ services:
build: dockers/back/.
privileged: true
restart: unless-stopped

depends_on:
- ravada-mysql

Expand Down
2 changes: 1 addition & 1 deletion dockerfy/dockers/back/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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 iptstate \
libnet-openssh-perl libdatetime-format-dateparse-perl file tzdata libxml2-utils libfile-tee-perl \
libnet-openssh-perl libdatetime-format-dateparse-perl file tzdata libxml2-utils libfile-tee-perl ovmf\
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
Expand Down
12 changes: 3 additions & 9 deletions dockerfy/utils/remove_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
read -r -p "Remove images (front - back - mysql) - Are you sure? [Y/n]" response
response=${response,,} # tolower
if [[ $response =~ ^(yes|y| ) ]] || [[ -z $response ]]; then
docker image rm mysql:5.7 -f
docker image rm dockerfy_ravada-back:latest -f
docker image rm dockerfy_ravada-front:latest -f
docker image rm mariadb:11.4 -f
docker image rm dockerfy-ravada-back:latest -f
docker image rm dockerfy-ravada-front:latest -f
fi

read -r -p "Remove volume dockerfy_sshkeys - Are you sure? [Y/n]" response
Expand All @@ -19,9 +19,3 @@ response=${response,,} # tolower
if [[ $response =~ ^(yes|y| ) ]] || [[ -z $response ]]; then
rm -rfv /opt/ravada/*
fi

read -r -p "Warning! - Remove Remove all dangling images - Are you sure? [Y/n]" response
response=${response,,} # tolower
if [[ $response =~ ^(yes|y| ) ]] || [[ -z $response ]]; then
docker system prune
fi

0 comments on commit f5622cb

Please sign in to comment.