mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-06 01:13:16 +02:00
Initial add of Docker package builder. Tested to launch and permit configuration from localhost,
but doesn't appear to accept new connections from outside the machine (possible fireall rule?)
This commit is contained in:
Heather Anderson
parent
9b54a97912
commit
8cf0c3708f
5 changed files with 222 additions and 4 deletions
43
pkg-scripts/Dockerfile.templ
Normal file
43
pkg-scripts/Dockerfile.templ
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
FROM ubuntu:18.04
|
||||
ARG DEPENDS
|
||||
ARG GITSRC
|
||||
ARG GITDATE
|
||||
ARG GITCOMMIT
|
||||
|
||||
# starting out as root, will drop back in entrypoint.sh
|
||||
USER root
|
||||
|
||||
# expose ports for domain server
|
||||
EXPOSE 40100 40101 40102
|
||||
EXPOSE 40100/udp 40101/udp 40102/udp
|
||||
|
||||
# expose ports for assignment client
|
||||
EXPOSE 48000/udp 48001/udp 48002/udp 48003/udp 48004/udp 48005/udp 48006/udp
|
||||
|
||||
RUN echo UTC >/etc/timezone
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
||||
apt-get install -y tzdata supervisor ${DEPENDS} && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
mkdir -p /var/lib/athena
|
||||
RUN groupadd -r athena ; \
|
||||
useradd -Nr athena -d /var/lib/athena ; \
|
||||
usermod -aG athena athena ; \
|
||||
chown athena.athena /var/lib/athena ; \
|
||||
exit 0
|
||||
|
||||
VOLUME /var/lib/athena
|
||||
|
||||
RUN mkdir -p /var/run ; chmod 777 /var/run
|
||||
COPY athena.conf /etc/supervisor/conf.d/athena.conf
|
||||
|
||||
COPY entrypoint.sh /
|
||||
COPY opt /opt/athena
|
||||
COPY lib /opt/athena/lib
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/athena.conf"]
|
||||
LABEL \
|
||||
net.projectathena.gitsrc="${GITSRC}" \
|
||||
net.projectathena.gitdate="${GITDATE}" \
|
||||
net.projectathena.gitcommit="${GITCOMMIT}"
|
||||
|
|
@ -7,20 +7,26 @@ base folder/
|
|||
build/ result of cmake build
|
||||
qt5-install/ installed or built Qt5 installation
|
||||
|
||||
These scripts assume that the current directory is the pkg-scripts folder inside of the source directory
|
||||
and that the base folder can be reached by going to "../..". This may not work if pkg-scripts is a symlink;
|
||||
adding an ATHENA=~/Athena to the beginning of the commandline will override where it looks for the base folder
|
||||
|
||||
Ubuntu:
|
||||
DEBEMAIL="your-email@somewhere.com" DEBFULLNAME="Your Full Name" ./make-deb-server
|
||||
|
||||
This script will retrieve the current git commit date and hash and assemble a version from it.
|
||||
It will attempt construct a .deb file in the pkg-scripts folder, assuming the Athena base folder
|
||||
is located at ../..
|
||||
It will attempt construct a .deb file in the pkg-scripts folder
|
||||
|
||||
Amazon Linux 2:
|
||||
./athena-server.spec
|
||||
|
||||
This script will retrieve the current git commit date and hash and assemble a version from it.
|
||||
It will attempt construct a .deb file in the pkg-scripts folder, assuming the Athena base folder
|
||||
is located at ../..
|
||||
It will attempt construct a .deb file in the pkg-scripts folder
|
||||
|
||||
Docker:
|
||||
./make-docker-server
|
||||
|
||||
This script will attempt to create a docker container
|
||||
|
||||
Results:
|
||||
The following directory structure is created for binaries:
|
||||
|
|
|
|||
76
pkg-scripts/docker-athena-supervisor.conf
Normal file
76
pkg-scripts/docker-athena-supervisor.conf
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
[supervisord]
|
||||
user=athena
|
||||
nodaemon=true
|
||||
environment=HOME="/var/lib/athena",USER="athena",LD_LIBRARY_PATH="/opt/athena/lib"
|
||||
logfile=/dev/stdout
|
||||
logfile_maxbytes=0
|
||||
pidfile=/var/run/supervisord.pid
|
||||
|
||||
[program:domain-server]
|
||||
command=/opt/athena/domain-server
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
|
||||
[program:audio-mixer]
|
||||
command=/opt/athena/assignment-client -t 0 -a localhost -p 48000
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:avatar-mixer]
|
||||
command=/opt/athena/assignment-client -t 1 -a localhost -p 48001
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:entities-server]
|
||||
command=/opt/athena/assignment-client -t 6 -a localhost -p 48006
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:asset-server]
|
||||
command=/opt/athena/assignment-client -t 3 -a localhost -p 48003
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:entity-script-server]
|
||||
command=/opt/athena/assignment-client -t 5 -a localhost -p 48005
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:messages-mixer]
|
||||
command=/opt/athena/assignment-client -t 4 -a localhost -p 48004
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:scripted-agent]
|
||||
command=/opt/athena/assignment-client -t 2 -a localhost --max 100
|
||||
autorestart=unexpected
|
||||
directory=/opt/athena
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
33
pkg-scripts/docker-entrypoint.sh
Executable file
33
pkg-scripts/docker-entrypoint.sh
Executable file
|
|
@ -0,0 +1,33 @@
|
|||
#!/bin/sh
|
||||
set -x
|
||||
|
||||
|
||||
# In Prod, this may be configured with a GID already matching the container
|
||||
# allowing the container to be run directly as Jenkins. In Dev, or on unknown
|
||||
# environments, run the container as root to automatically correct docker
|
||||
# group in container to match the docker.sock GID mounted from the host.
|
||||
if [ -f /var/lib/athena/.local -a "$(id -u)" = "0" ]; then
|
||||
# realign gid
|
||||
THIS_ATHENA_GID=`ls -ngd /var/lib/athena/.local | cut -f3 -d' '`
|
||||
CUR_ATHENA_GID=`getent group athena | cut -f3 -d: || true`
|
||||
if [ ! -z "$THIS_ATHENA_GID" -a "$THIS_ATHENA_GID" != "$CUR_ATHENA_GID" ]; then
|
||||
groupmod -g ${THIS_ATHENA_GID} -o athena
|
||||
fi
|
||||
|
||||
# realign pid
|
||||
THIS_ATHENA_PID=`ls -nd /var/lib/athena/.local | cut -f3 -d' '`
|
||||
CUR_ATHENA_PID=`getent passwd athena | cut -f3 -d: || true`
|
||||
if [ ! -z "$THIS_ATHENA_PID" -a "$THIS_ATHENA_PID" != "$CUR_ATHENA_PID" ]; then
|
||||
usermod -u ${THIS_ATHENA_PID} -o athena
|
||||
fi
|
||||
|
||||
if ! groups athena | grep -q athena; then
|
||||
usermod -aG athena athena
|
||||
fi
|
||||
fi
|
||||
|
||||
chmod 777 /dev/stdout
|
||||
chmod 777 /dev/stderr
|
||||
|
||||
# continue with CMD
|
||||
exec "$@"
|
||||
60
pkg-scripts/make-docker-server
Executable file
60
pkg-scripts/make-docker-server
Executable file
|
|
@ -0,0 +1,60 @@
|
|||
#!/bin/sh
|
||||
|
||||
if [ "$ATHENA" = "" ]; then
|
||||
ATHENA=`realpath ../..`
|
||||
fi
|
||||
|
||||
GITSRC=`git -C $ATHENA/source config --get remote.origin.url | cut -d':' -f 2`
|
||||
GITDATE=`git -C $ATHENA/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"`
|
||||
GITCOMMIT=`git -C $ATHENA/source rev-parse HEAD | cut -c 1-7`
|
||||
|
||||
sudo apt-get install chrpath binutils
|
||||
|
||||
DOCK_BUILD_ROOT=temp-make-dock
|
||||
rm -r temp-make-dock
|
||||
mkdir -p $DOCK_BUILD_ROOT
|
||||
cp $ATHENA/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile
|
||||
cp $ATHENA/source/pkg-scripts/docker-entrypoint.sh $DOCK_BUILD_ROOT/entrypoint.sh
|
||||
cp $ATHENA/source/pkg-scripts/docker-athena-supervisor.conf $DOCK_BUILD_ROOT/athena.conf
|
||||
|
||||
# copy the files over
|
||||
mkdir -p $DOCK_BUILD_ROOT/opt
|
||||
cp $ATHENA/build/assignment-client/assignment-client $DOCK_BUILD_ROOT/opt
|
||||
cp $ATHENA/build/domain-server/domain-server $DOCK_BUILD_ROOT/opt
|
||||
cp $ATHENA/build/tools/oven/oven $DOCK_BUILD_ROOT/opt
|
||||
#cp $ATHENA/build/ice-server/ice-server $DOCK_BUILD_ROOT/opt
|
||||
strip --strip-all $DOCK_BUILD_ROOT/opt/*
|
||||
chrpath -d $DOCK_BUILD_ROOT/opt/*
|
||||
|
||||
cp -a $ATHENA/build/assignment-client/plugins $DOCK_BUILD_ROOT/opt
|
||||
strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*.so
|
||||
chrpath -d $DOCK_BUILD_ROOT/opt/plugins/*.so
|
||||
strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*/*.so
|
||||
chrpath -d $DOCK_BUILD_ROOT/opt/plugins/*/*.so
|
||||
|
||||
cp -a $ATHENA/source/domain-server/resources $DOCK_BUILD_ROOT/opt
|
||||
find $DOCK_BUILD_ROOT/opt/resources -name ".gitignore" -delete
|
||||
find $DOCK_BUILD_ROOT/opt/resources -type f -executable -exec sh -c 'chmod -x {}' \;
|
||||
|
||||
mkdir -p $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/build/libraries/*/*.so $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Network.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Core.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Widgets.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Gui.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Script.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Quick.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5WebSockets.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5Qml.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/qt5-install/lib/libQt5ScriptTools.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
cp $ATHENA/build/ext/makefiles/quazip/project/lib/libquazip5.so.*.*.* $DOCK_BUILD_ROOT/lib
|
||||
chmod +x $DOCK_BUILD_ROOT/lib/*
|
||||
strip --strip-all $DOCK_BUILD_ROOT/lib/*
|
||||
chrpath -d $DOCK_BUILD_ROOT/lib/*
|
||||
ldconfig -n $DOCK_BUILD_ROOT/lib
|
||||
|
||||
SOFILES=`ls $DOCK_BUILD_ROOT/lib | sed 's/\./\\\./g' | paste -d'|' -s`
|
||||
DEPENDS=`find $DOCK_BUILD_ROOT/opt $DOCK_BUILD_ROOT/lib -type f -executable -exec sh -c 'objdump -p {} | grep NEEDED' \; | awk '{print $2}' | sort | uniq | egrep -v "^($SOFILES)$" | xargs -n 1 -I {} sh -c 'dpkg -S {} | head -n 1' | cut -d ':' -f 1 | sort | uniq | paste -d' ' -s`
|
||||
|
||||
cd $DOCK_BUILD_ROOT
|
||||
docker build -t odysseus654/athena-server --build-arg "DEPENDS=$DEPENDS" --build-arg "GITSRC=$GITSRC" --build-arg "GITDATE=$GITDATE" --build-arg "GITCOMMIT=$GITCOMMIT" .
|
||||
Loading…
Reference in a new issue