Merge pull request #13 from lmbelo/main

Update, bugfix and automation

.github/workflows/docker-image-publish.yml

@@ -0,0 +1,31 @@
+name: Docker Image CI - Publish
+
+on:
+  release:
+    types: [published]
+
+  # Manual run
+  workflow_dispatch:
+
+jobs:
+
+  publish:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Docker Hub Login
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+      run: |
+        echo "$DOCKER_TOKEN" | docker login --username $DOCKER_USERNAME --password-stdin       
+    
+    - name: Build the Docker image
+      run: |
+        bash ./build.sh
+
+    - name: Docker Push
+      run: |
+        docker push -a radstudio/pa-radserver-ib

.github/workflows/docker-image-test.yml

@@ -0,0 +1,19 @@
+name: Docker Image CI - Test
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build the Docker image
+      run: |
+        bash ./build.sh

Dockerfile

@@ -7,16 +7,18 @@ ENV PA_SERVER_PASSWORD=$password
 #INSTALL APACHE AND OTHER LIBS
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -yy --no-install-recommends install \
-    apache2 \
+    joe \
+    wget \
+    p7zip-full \
+    curl \
+    openssh-server \
     build-essential \
-    libcurl4-openssl-dev \
-    libcurl4 \
-    libgl1-mesa-dev \
-    libgtk-3-bin \
-    libosmesa-dev \
+    zlib1g-dev \
+    libcurl4-gnutls-dev \
+    libncurses5 \
     libpython3.10 \
+    apache2 \
     unzip \
-    xorg \
     && apt-get -y autoremove \
     && apt-get -y autoclean
 #====END OTHER LIBS
@@ -106,8 +108,6 @@ RUN service apache2 restart
 EXPOSE 80 
 # PAServer
 EXPOSE 64211
-# broadwayd
-EXPOSE 8082
 #Interbase
 EXPOSE 3050
 

README.md

@@ -9,7 +9,7 @@ Docker script to build RAD Studio Linux deployment including RAD Server engine a
 - More information on [RAD Studio](https://www.embarcadero.com/products/rad-studio)
 - Other containers: [InterBase](https://github.com/Embarcadero/InterBase-Docker) only, [PAServer](https://github.com/Embarcadero/paserver-docker) and [RAD Server container](https://github.com/Embarcadero/pa-radserver-docker).
 
-The image defaults to running **PAServer** on port `64211` with the _password_ `securepass`, and **Broadwayd** on port `8082`
+The image defaults to running **PAServer** on port `64211` with the _password_ `securepass`
 
 The 10.x images use Ubuntu 18.04.6 LTS (Bionic Beaver) while the 11.x images use Ubuntu 22.04.1 LTS (Jammy Jellyfish)
 

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

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 echo "PAServer Password: securepass"
-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
+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

@@ -3,7 +3,7 @@
 echo "PAServer Password: securepass"
 docker run -it -e PA_SERVER_PASSWORD=securepass \
     --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
-    -p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 \
+    -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
+    pa-radserver-ib-custom-module

radserver_docker.sh

@@ -15,14 +15,6 @@ if [ -f /etc/ems/module.so ]; then
 	sed -i ':a;N;$!ba;s#\[Server\.Packages\]\n#\[Server\.Packages\]\n/etc/ems/module.so=module#g' /etc/ems/emsserver.ini
 fi
 
-if [ "$CONFIG" = "PRODUCTION" ]; then
-	:
-else
-	nohup broadwayd :2 &
-	export GDK_BACKEND=broadway
-	export BROADWAY_DISPLAY=:2
-fi
-
 /usr/sbin/apachectl -D Foreground
 status=$?
 if [ $status -ne 0 ]; then

run-production.sh

@@ -2,7 +2,7 @@
 
 echo "PAServer Password: securepass"
 docker run  -it -e PA_SERVER_PASSWORD=securepass \
-    -p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 \
+    -p 80:80 -p 64211:64211 -p 3050:3050 \
     --mount source=interbase,target=/opt/interbase \
     --mount source=ems,target=/etc/ems  \
     --platform linux/amd64 \

run.sh

@@ -3,7 +3,7 @@
 echo "PAServer Password: securepass"
 docker run  --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
     -it -e PA_SERVER_PASSWORD=securepass \
-    -p 80:80 -p 64211:64211 -p 8082:8082 -p 3050:3050 \
+    -p 80:80 -p 64211:64211 -p 3050:3050 \
     --mount source=interbase,target=/opt/interbase \
     --mount source=ems,target=/etc/ems  \
     --platform linux/amd64 \