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

Update Dockerfile #23

Draft
wants to merge 57 commits into
base: mysql
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
855edb3
Update Dockerfile
curtishall Aug 3, 2023
ac0704f
Update Dockerfile
curtishall Aug 3, 2023
22b03d3
Update Dockerfile
curtishall Aug 3, 2023
48ff88d
Update Dockerfile
curtishall Aug 3, 2023
b5e1fbf
Update Dockerfile
curtishall Aug 3, 2023
6223df5
Update Dockerfile
curtishall Aug 3, 2023
871707f
Update Dockerfile
curtishall Aug 3, 2023
f306a32
Update Dockerfile
curtishall Aug 4, 2023
9f56368
Update Dockerfile
curtishall Aug 4, 2023
0e137a0
Update Dockerfile
curtishall Aug 4, 2023
e68738f
Update Dockerfile
curtishall Aug 5, 2023
97fb724
Update Dockerfile
curtishall Aug 5, 2023
b55a36e
Update Dockerfile
curtishall Aug 5, 2023
9b87151
Update Dockerfile
curtishall Aug 5, 2023
b025c9f
Update docker-publish.yml
curtishall Aug 7, 2023
6760f92
Update Dockerfile
curtishall Aug 7, 2023
dcb6388
Update Dockerfile
curtishall Aug 7, 2023
b0fed18
Update Dockerfile
curtishall Aug 7, 2023
825a4dc
Update Dockerfile
curtishall Aug 26, 2023
29cb8ec
Update Dockerfile
curtishall Aug 26, 2023
837a8b3
Update Dockerfile
curtishall Aug 27, 2023
2c7a73e
Update Dockerfile
curtishall Aug 27, 2023
5fd6ed0
Update entrypoint.sh
curtishall Aug 27, 2023
0a5c0da
Update Dockerfile
curtishall Aug 27, 2023
56c4d2f
Update Dockerfile
curtishall Aug 27, 2023
81f896c
Update Dockerfile
curtishall Aug 27, 2023
6ee0c58
Update Dockerfile
curtishall Aug 27, 2023
f5e41cf
Update Dockerfile
curtishall Aug 27, 2023
6eef559
Update Dockerfile
curtishall Aug 28, 2023
dbc73a4
Update Dockerfile
curtishall Aug 28, 2023
5af5b34
Update Dockerfile
curtishall Aug 28, 2023
dd65c62
Update Dockerfile
curtishall Aug 28, 2023
c579b36
Update Dockerfile
curtishall Aug 28, 2023
74c7dfe
Update Dockerfile
curtishall Sep 17, 2023
8e3980b
Update Dockerfile - RC9
curtishall Sep 17, 2023
202db63
Update Dockerfile
curtishall Sep 17, 2023
eea49d5
Update Dockerfile
curtishall Sep 24, 2023
e22876c
Update Dockerfile
curtishall Sep 24, 2023
fba68f2
Update Dockerfile
curtishall Sep 24, 2023
43782f3
Update Dockerfile
curtishall Sep 24, 2023
6dc1ca5
Update Dockerfile
curtishall Sep 24, 2023
63b7ecf
Update Dockerfile
curtishall Sep 24, 2023
f8aa0fb
Update Dockerfile
curtishall Sep 24, 2023
9bfe63f
Update Dockerfile
curtishall Sep 24, 2023
6398f9a
Update entrypoint.sh
curtishall Sep 25, 2023
198d608
Update Dockerfile
curtishall Sep 25, 2023
5d8aac8
Update Dockerfile
curtishall Sep 26, 2023
fb866a0
Update entrypoint.sh
curtishall Sep 26, 2023
9da5d80
Update docker-publish.yml
curtishall Sep 26, 2023
0540275
Update Dockerfile
curtishall Oct 15, 2023
752c6f2
Update Dockerfile
curtishall Oct 16, 2023
0529561
Update entrypoint.sh
curtishall Oct 16, 2023
aff4d84
Update entrypoint.sh
curtishall Oct 23, 2023
d9ec3fe
Update Dockerfile
curtishall Nov 3, 2023
03868a3
Update Dockerfile
curtishall Nov 5, 2023
078f05b
Update entrypoint.sh
curtishall Nov 8, 2023
cac7b76
Update install.sh
curtishall Nov 10, 2023
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
4 changes: 3 additions & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
run: docker ps
- name: Check out the repo
uses: actions/checkout@v3
- name: Identify git repo path
run: ls $GITHUB_WORKSPACE && ls -l /home/runner/work/
- name: Wait for mysql
run: sleep 15
- name: Set up Docker Buildx
Expand All @@ -77,5 +79,5 @@ jobs:
# password: ${{ secrets.DOCKER_PASSWORD }}
# file: ./server/Dockerfile
push: true
tags: bluecherrydvr/bluecherry:citesting
tags: bluecherrydvr/bluecherry:unstable
labels: github_ci
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -302,4 +302,6 @@ RUN chmod +x /entrypoint.sh \
&& chmod +x /bin/bc-database-create \
&& chmod +x /bin/bc-database-upgrade

CMD /etc/init.d/php7.4-fpm restart

CMD "/entrypoint.sh"
15 changes: 10 additions & 5 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ docker_compose_init() {
#uptimekuma


echo "\n\nDownloading latest Bluecherry and related images...this may take a while...\n\n"
echo "Downloading latest Bluecherry and related images...this may take a while..."

cd "$workingpath/bluecherry-docker"

Expand All @@ -42,7 +42,7 @@ docker compose pull
docker compose up bc-mysql -d

echo "Sleeping 45 seconds to make sure the database is initialized correctly..."
echo "\n\n"

sleep 45
docker compose stop bc-mysql
docker compose up -d bc-mysql
Expand Down Expand Up @@ -76,7 +76,7 @@ Create a password for the mysql bluecherry user
"

echo "Time Zone (i.e. - America/Chicago): "
read timezone
read timezoneset

#read -p "Time Zone (i.e. - America/Chicago):" timezone
#timezoneset="${timezone:=American/Chicago}"
Expand Down Expand Up @@ -257,7 +257,7 @@ case $distribution in
"debian" | "ubuntu")
install_debian_packages
;;
"centos" | "rhel" | "fedora")
"centos" | "rhel" | "fedora" | "rocky" | "Rocky")
install_redhat_packages
;;
"sles" | "opensuse" | "suse")
Expand Down Expand Up @@ -311,6 +311,11 @@ install_suse_packages() {
install_arch_packages() {
pacman -Syu --noconfirm git
install_docker
sed -i 's/^LimitNOFILE=infinity$/LimitNOFILE=1048576/' /usr/lib/systemd/system/docker.service
sed -i 's/^LimitNOFILE=infinity$/LimitNOFILE=1048576/' /usr/lib/systemd/system/containerd.service
systemctl start docker
systemctl enable docker
pacman -Syu --noconfirm docker-compose
}

# Function to install packages on Fedora
Expand Down Expand Up @@ -390,7 +395,7 @@ docker_compose_init
esac


read -p "Do you want to configure SMTP settings?? [y/n]: " smtp
read -p "Do you want to configure SMTP settings? [y/n]: " smtp

case $smtp in
y)
Expand Down
Loading
Loading