Skip to content

Commit ba6af75

Browse files
committed
Drop broadway support
1 parent 17427be commit ba6af75

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ ENV PA_SERVER_PASSWORD=$password
77
#INSTALL APACHE AND OTHER LIBS
88
RUN apt-get update && \
99
DEBIAN_FRONTEND=noninteractive apt-get -yy --no-install-recommends install \
10-
apache2 \
10+
joe \
11+
wget \
12+
p7zip-full \
13+
curl \
14+
openssh-server \
1115
build-essential \
12-
libcurl4-openssl-dev \
13-
libcurl4 \
14-
libgl1-mesa-dev \
15-
libgtk-3-bin \
16-
libosmesa-dev \
16+
zlib1g-dev \
17+
libcurl4-gnutls-dev \
18+
libncurses5 \
1719
libpython3.10 \
20+
apache2 \
1821
unzip \
19-
xorg \
2022
&& apt-get -y autoremove \
2123
&& apt-get -y autoclean
2224
#====END OTHER LIBS
@@ -106,8 +108,6 @@ RUN service apache2 restart
106108
EXPOSE 80
107109
# PAServer
108110
EXPOSE 64211
109-
# broadwayd
110-
EXPOSE 8082
111111
#Interbase
112112
EXPOSE 3050
113113

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

33
echo "PAServer Password: securepass"
4-
docker run -d -e CONFIG=PRODUCTION -e PA_SERVER_PASSWORD=securepass -p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 --mount source=interbase,target=/opt/interbase --mount source=ems,target=/etc/ems pa-radserver-ib-custom-module
4+
docker run -d -e CONFIG=PRODUCTION -e PA_SERVER_PASSWORD=securepass -p 80:80 -p 64211:64211 -p 3050:3050 --mount source=interbase,target=/opt/interbase --mount source=ems,target=/etc/ems pa-radserver-ib-custom-module

Solutions/Custom-RAD-Server-Module/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
echo "PAServer Password: securepass"
44
docker run -it -e PA_SERVER_PASSWORD=securepass \
55
--cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
6-
-p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 \
6+
-p 80:80 -p 64211:64211 -p 3050:3050 \
77
--mount source=interbase,target=/opt/interbase \
88
--mount source=ems,target=/etc/ems \
9-
pa-radserver-ib-custom-module
9+
pa-radserver-ib-custom-module

radserver_docker.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ if [ -f /etc/ems/module.so ]; then
1515
sed -i ':a;N;$!ba;s#\[Server\.Packages\]\n#\[Server\.Packages\]\n/etc/ems/module.so=module#g' /etc/ems/emsserver.ini
1616
fi
1717

18-
if [ "$CONFIG" = "PRODUCTION" ]; then
19-
:
20-
else
21-
nohup broadwayd :2 &
22-
export GDK_BACKEND=broadway
23-
export BROADWAY_DISPLAY=:2
24-
fi
25-
2618
/usr/sbin/apachectl -D Foreground
2719
status=$?
2820
if [ $status -ne 0 ]; then

run-production.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo "PAServer Password: securepass"
44
docker run -it -e PA_SERVER_PASSWORD=securepass \
5-
-p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 \
5+
-p 80:80 -p 64211:64211 -p 3050:3050 \
66
--mount source=interbase,target=/opt/interbase \
77
--mount source=ems,target=/etc/ems \
88
--platform linux/amd64 \

run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
echo "PAServer Password: securepass"
44
docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
55
-it -e PA_SERVER_PASSWORD=securepass \
6-
-p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 \
6+
-p 80:80 -p 64211:64211 -p 3050:3050 \
77
--mount source=interbase,target=/opt/interbase \
88
--mount source=ems,target=/etc/ems \
99
--platform linux/amd64 \

0 commit comments

Comments
 (0)