aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorterminaldweller <thabogre@gmail.com>2022-12-28 12:50:39 +0000
committerterminaldweller <thabogre@gmail.com>2022-12-28 12:50:39 +0000
commit6ab107381192d2bbcca6042cd50ed36adbe70fbd (patch)
tree3e38a7196bb8ce6b62432c01207f5f46e58d8c0c /docker
parentnow just reading /proc/net/arp instead of using subprocess. (diff)
downloadscripts-6ab107381192d2bbcca6042cd50ed36adbe70fbd.tar.gz
scripts-6ab107381192d2bbcca6042cd50ed36adbe70fbd.zip
update
Diffstat (limited to 'docker')
-rw-r--r--docker/bitlbee-purple/conf/bitlbee.conf2
-rw-r--r--docker/bitlbee-purple/docker-compose.yaml20
2 files changed, 14 insertions, 8 deletions
diff --git a/docker/bitlbee-purple/conf/bitlbee.conf b/docker/bitlbee-purple/conf/bitlbee.conf
index 4a1540b..7d04efd 100644
--- a/docker/bitlbee-purple/conf/bitlbee.conf
+++ b/docker/bitlbee-purple/conf/bitlbee.conf
@@ -118,7 +118,7 @@ ConfigDir = /var/lib/bitlbee
##
## Proxy = http://john:doe@proxy.localnet.com:8080
## Proxy = socks4://socksproxy.localnet.com
-## Proxy = socks5://socksproxy.localnet.com
+Proxy = socks5://192.168.1.214:9995
[defaults]
diff --git a/docker/bitlbee-purple/docker-compose.yaml b/docker/bitlbee-purple/docker-compose.yaml
index 6a9547e..193a14f 100644
--- a/docker/bitlbee-purple/docker-compose.yaml
+++ b/docker/bitlbee-purple/docker-compose.yaml
@@ -1,16 +1,22 @@
version: "3.7"
services:
bitlbee:
- # image: ezkrg/bitlbee-libpurple
- image: luzifer/bitlbee
+ image: bitlbee_devi
networks:
- bitlbeenet
ports:
- - "127.0.0.1:6667:6667"
+ - "8667:6667"
restart: unless-stopped
- # this is causing permission issues
- # user: "bitlbee:bitlbee"
- # volumes:
- # - ./conf:/var/lib/bitlbee
+ network_mode: bridge
+ user: "bitlbee:bitlbee"
+ command: ["/usr/sbin/bitlbee", "-F","-n","-u","bitlbee","-c","/var/lib/bitlbee/bitlbee.conf", "-d","bitlbee-user-data"]
+ volumes:
+ - ./conf/bitlbee.conf:/var/lib/bitlbee/bitlbee.conf
networks:
bitlbeenet:
+ ipam:
+ driver: overlay
+ config:
+ - subnet: 172.18.0.0/16
+ - ip_range: 172.18.5.0.24
+ - gateway: 172.18.0.1