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.

Sign up for GitHub

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

Fix/2078 docker: Some bugs in docker deploy #2125

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Fix/2078 docker: Some bugs in docker deploy #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a80d379
Fix mysql problem (#2078)
fv3rdugo Jan 9, 2025
e4cbdef
Fix docker-compose (#2078)
fv3rdugo Jan 9, 2025
dcbca33
Fix docker flush
fv3rdugo Jan 9, 2025
5b54f01
Fix error ovmf (#2078)
fv3rdugo Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions dockerfy/docker-compose.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading