Revert "Add priv-control to default install"

This reverts commit 0ff470d35c.
api
Simon 3 years ago
parent 0ff470d35c
commit 0eb8d8853f

@ -22,16 +22,12 @@ services:
container_name: freedmr
cpu_shares: 1024
mem_reservation: 600m
depends_on:
-freedmr-priv-control
volumes:
- '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
- '/var/log/freedmr/:/opt/freedmr/log/'
- '/etc/freedmr/rules.py:/opt/freedmr/rules.py'
#Write JSON files outside of container
- '/etc/freedmr/json/:/opt/freedmr/json/'
- '/etc/freedmr/sockets/priv_control:/run/priv_control/'
ports:
- '62031:62031/udp'
@ -107,19 +103,6 @@ services:
logging:
driver: json-file
freedmr-priv-control:
container_name: freedmr-priv-control
image: 'gitlab.hacknix.net:5050/freedmr/freedmr-privileged-control/priv_control:bullseye-latest'
restart: "unless-stopped"
volumes:
- '/etc/freedmr/sockets/priv_control:/run/priv_control/'
logging:
driver: json-file
cap_add:
- NET_ADMIN
network_mode: "host"
networks:
app_net:
driver: bridge

@ -22,9 +22,9 @@ echo FreeDMR Docker installer...
echo Installing required packages...
echo Install Docker Community Edition...
apt-get -y remove docker docker-engine docker.io ufw &&
apt-get -y remove docker docker-engine docker.io &&
apt-get -y update &&
apt-get -y install apt-transport-https ca-certificates curl gnupg2 software-properties-common conntrack iptables &&
apt-get -y install apt-transport-https ca-certificates curl gnupg2 software-properties-common &&
curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - &&
ARCH=`/usr/bin/arch`
echo "System architecture is $ARCH"
@ -62,7 +62,6 @@ echo Make config directory...
mkdir /etc/freedmr &&
mkdir -p /etc/freedmr/acme.sh &&
mkdir -p /etc/freedmr/certs &&
mkdir -p /etc/freedmr/sockets &&
chmod -R 755 /etc/freedmr &&
echo make json directory...
@ -187,6 +186,8 @@ echo Get docker-compose.yml...
cd /etc/freedmr &&
curl https://gitlab.hacknix.net/hacknix/FreeDMR/-/raw/master/docker-configs/docker-compose.yml -o docker-compose.yml &&
chmod 755 /etc/cron.daily/lastheard
echo Tune network stack...
cat << EOF > /etc/sysctl.conf &&
net.core.rmem_default=134217728

Loading…
Cancel
Save

Powered by TurnKey Linux.