Commit 7c8b3998 authored by jan.koester's avatar jan.koester
Browse files

test

parent a24ca751

editor/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ FROM node:alpine AS build 
WORKDIR /build/alpine



RUN apk update --no-cache  && apk upgrade --no-cache 

RUN apk add --no-cache cmake ninja clang alpine-sdk lua-aports sudo openssh-keygen fakeroot openssh-client yaml-dev brotli-dev json-c-dev sqlite-dev libpq-dev mariadb-dev util-linux-dev libc-dev tinyxml2-dev ffmpeg-dev

RUN apk add --no-cache cmake ninja clang alpine-sdk lua-aports sudo openssh-keygen fakeroot openssh-client yaml-dev brotli-dev json-c-dev sqlite-dev libpq-dev mariadb-dev util-linux-dev libc-dev tinyxml2-dev ffmpeg-dev nodejs nodejs-dev



RUN git clone https://git.tuxist.de/git/jan.koester/libcmdplus.git

RUN mkdir libcmdplus/build
@@ -63,7 +63,7 @@ FROM node:alpine 
RUN addgroup blogi

RUN adduser blogi -h /var/lib/blogi -S -G blogi

RUN apk update && apk upgrade

RUN apk add --no-cache yaml brotli openssl ca-certificates json-c libuuid libpq mariadb-connector-c sqlite-libs libstdc++ pwgen sed tinyxml2 ffmpeg

RUN apk add --no-cache yaml brotli openssl ca-certificates json-c libuuid libpq mariadb-connector-c sqlite-libs libstdc++ pwgen sed tinyxml2 ffmpeg nodejs



RUN mkdir /etc/blogi

RUN mkdir /usr/local/share/blogi

packaging/build-nspawn.sh

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ setup_toolchain() { 
            make -j\$(nproc)

            make install



            # Ensure loader path used by musl-linked binaries exists.

            ln -sf /usr/local/musl/lib/libc.so /lib/ld-musl-x86_64.so.1



            echo '==> musl installed'

        "
@@ -287,6 +290,7 @@ if [ \"\\\$LINKING\" = \"1\" ]; then 
        --unwindlib=none -nostdlib \\\\

        /usr/local/musl/lib/crt1.o /usr/local/musl/lib/crti.o \\\\

        -lc++ -lc++abi -lunwind -lc -lclang_rt.builtins-x86_64 \\\\

        -Wl,--dynamic-linker=/lib/ld-musl-x86_64.so.1 \\\\

        /usr/local/musl/lib/crtn.o \\\\

        -Wl,-rpath,/usr/local/musl/lib -Wl,-rpath,/usr/local/lib \\\\

        \"\\\$@\"
@@ -315,6 +319,7 @@ if [ \"\\\$LINKING\" = \"1\" ]; then 
        -nostdlib \\\\

        /usr/local/musl/lib/crt1.o /usr/local/musl/lib/crti.o \\\\

        -lc -lclang_rt.builtins-x86_64 \\\\

        -Wl,--dynamic-linker=/lib/ld-musl-x86_64.so.1 \\\\

        /usr/local/musl/lib/crtn.o \\\\

        -Wl,-rpath,/usr/local/musl/lib -Wl,-rpath,/usr/local/lib \\\\

        \"\\\$@\"