Commit 1ad7c9e9 authored by jan.koester's avatar jan.koester
Browse files

test

parent fb1598a9

Dockerfile

+6 −5
Changes for Dockerfile: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#   docker run -d -v blogi-etc:/etc/blogi -p 443:443 -e CLIENTURL=... -e PORT=443 ... blogi

#

# fenriros-devel lacks libpq, SQLite, libdbpp, the SMTP client, MediaDB's client library,

# libgameinfoplus and authcli, so the build stage builds them first: libpq from the

# libgameinfoplus and fenrirdsctl, so the build stage builds them first: libpq from the

# PostgreSQL release tarball with the FenrirOS CMake port in docker/postgresql/ (no autoconf

# on FenrirOS), SQLite from its amalgamation, the rest from their git repos.

# libdbpp is built without its MariaDB backend (no MariaDB connector on FenrirOS yet), so
@@ -96,15 +96,16 @@ RUN set -e; \ 
    # CPP-SMTPClient does not include GNUInstallDirs, so its include dir must be given

    build /src/smtpclient -DBUILD_TESTING=OFF -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_BINDIR=bin



# authcli (run.sh registers the blogi client with it); the authdb client library and

# headers come from libauthdb-client-dev, so only the tool is built and installed.

# fenrirdsctl (formerly authcli; run.sh registers the blogi client with it); the authdb

# client library and headers come from libauthdb-client-dev, so only the tool is built

# and installed.

RUN set -e; \

    cmake -S /src/authdb -B /src/authdb/build -G Ninja \

        -DCMAKE_BUILD_TYPE=Release \

        -DBUILD_BINDINGS=OFF \

        -DBUILD_TESTING=OFF; \

    cmake --build /src/authdb/build --target authcli; \

    install -Dm755 /src/authdb/build/cli/authcli /stage/usr/local/bin/authcli

    cmake --build /src/authdb/build --target fenrirdsctl; \

    install -Dm755 /src/authdb/build/cli/fenrirdsctl /stage/usr/local/bin/fenrirdsctl



WORKDIR /src/blogi

COPY . .

run.sh

+1 −1
Changes for run.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ if [ ! -f /etc/blogi/config.yaml ]; then 


    CLIENTSECRET=$(head -c 24 /dev/urandom | base64 | tr -d "/+=")



    /usr/local/bin/authcli addclient -h $CLIENTURL -n $(hostname) -u $USERNAME -p $PASSWORD -s $CLIENTSECRET

    /usr/local/bin/fenrirdsctl addclient -h $CLIENTURL -n $(hostname) -u $USERNAME -p $PASSWORD -s $CLIENTSECRET



    sed  -e "s|%CLIENTURL%|$CLIENTURL|g" \

    -e "s|%CLIENTNAME%|$(hostname)|g" \