Commit a7459680 authored by jan.koester's avatar jan.koester
Browse files

tes

parent ee55414d
Loading
Loading
Loading
Loading
+6 −6
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-dev

RUN git clone https://git.tuxist.de/git/jan.koester/libcmdplus.git
RUN mkdir libcmdplus/build
@@ -53,8 +53,8 @@ RUN mkdir CPP-SMTPClient-library/build
RUN cd CPP-SMTPClient-library/build && cmake ../ -G Ninja -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_INSTALL_INCLUDEDIR=/usr/local/include && ninja install

RUN git clone https://git.tuxist.de/git/jan.koester/blogi.git
RUN mkdir blogi/build
RUN cd blogi/build && cmake ../ -G Ninja -DBUILD_EDITOR=ON && ninja install
RUN mkdir ./blogi/build
RUN cd ./blogi/build && cmake ../ -G Ninja -DBUILD_EDITOR=ON && ninja install

#RUN mkdir /etc/blogi && cp blogi/config.yaml /etc/blogi

@@ -97,7 +97,7 @@ WORKDIR /blogi-editor
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 nodejs nodejs-libs
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-libs

RUN mkdir /etc/blogi
RUN mkdir /usr/local/share/blogi
@@ -108,7 +108,7 @@ COPY editor/docker-config.yaml /usr/local/share/blogi
COPY editor/config.test.two-widget-paths.yaml /usr/local/share/blogi-editor/config.test.two-widget-paths.yaml

RUN mkdir -p /usr/local/sbin /usr/local/bin /usr/local/lib
COPY run.sh /usr/local/sbin
COPY editor/run.sh /usr/local/sbin
RUN chmod +x /usr/local/sbin/run.sh

COPY --from=build /usr/local/bin/blogi-editor /usr/local/bin/blogi-editor