Loading editor/Dockerfile +4 −18 Original line number Diff line number Diff line FROM node:alpine AS build WORKDIR /build/alpine COPY . /tmp/context 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 nodejs nodejs-dev Loading Loading @@ -62,19 +60,7 @@ RUN git clone https://github.com/google/brotli.git RUN mkdir brotli/build RUN cd brotli/build && cmake ../ -G Ninja && ninja install RUN git clone https://git.tuxist.de/git/jan.koester/blogi.git && \ mkdir -p /build/runtime && \ if [ -f /tmp/context/editor/CMakeLists.txt ]; then \ cp -a /tmp/context/. /build/alpine/blogi/ && \ cp /tmp/context/editor/docker-config.yaml /build/runtime/docker-config.yaml && \ cp /tmp/context/editor/config.test.two-widget-paths.yaml /build/runtime/config.test.two-widget-paths.yaml && \ cp /tmp/context/editor/run.sh /build/runtime/run.sh; \ else \ cp -a /tmp/context/. /build/alpine/blogi/editor/ && \ cp /tmp/context/docker-config.yaml /build/runtime/docker-config.yaml && \ cp /tmp/context/config.test.two-widget-paths.yaml /build/runtime/config.test.two-widget-paths.yaml && \ cp /tmp/context/run.sh /build/runtime/run.sh; \ fi COPY . /build/alpine/blogi RUN rm -rf blogi/build blogi/build-editor blogi/build-editor-standalone blogi/obj-x86_64-linux-gnu RUN mkdir -p blogi/build RUN cd blogi/build && cmake ../ -DBUILD_EDITOR=ON -G Ninja && ninja install Loading @@ -93,11 +79,11 @@ RUN mkdir /usr/local/share/blogi RUN mkdir -p /var/lib/blogi-editor RUN mkdir -p /var/lib/blogi-editor/node/widgets COPY --from=build /build/runtime/docker-config.yaml /usr/local/share/blogi COPY --from=build /build/runtime/config.test.two-widget-paths.yaml /usr/local/share/blogi-editor/config.test.two-widget-paths.yaml COPY docker-config.yaml /usr/local/share/blogi COPY 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 --from=build /build/runtime/run.sh /usr/local/sbin/run.sh COPY 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 Loading Loading
editor/Dockerfile +4 −18 Original line number Diff line number Diff line FROM node:alpine AS build WORKDIR /build/alpine COPY . /tmp/context 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 nodejs nodejs-dev Loading Loading @@ -62,19 +60,7 @@ RUN git clone https://github.com/google/brotli.git RUN mkdir brotli/build RUN cd brotli/build && cmake ../ -G Ninja && ninja install RUN git clone https://git.tuxist.de/git/jan.koester/blogi.git && \ mkdir -p /build/runtime && \ if [ -f /tmp/context/editor/CMakeLists.txt ]; then \ cp -a /tmp/context/. /build/alpine/blogi/ && \ cp /tmp/context/editor/docker-config.yaml /build/runtime/docker-config.yaml && \ cp /tmp/context/editor/config.test.two-widget-paths.yaml /build/runtime/config.test.two-widget-paths.yaml && \ cp /tmp/context/editor/run.sh /build/runtime/run.sh; \ else \ cp -a /tmp/context/. /build/alpine/blogi/editor/ && \ cp /tmp/context/docker-config.yaml /build/runtime/docker-config.yaml && \ cp /tmp/context/config.test.two-widget-paths.yaml /build/runtime/config.test.two-widget-paths.yaml && \ cp /tmp/context/run.sh /build/runtime/run.sh; \ fi COPY . /build/alpine/blogi RUN rm -rf blogi/build blogi/build-editor blogi/build-editor-standalone blogi/obj-x86_64-linux-gnu RUN mkdir -p blogi/build RUN cd blogi/build && cmake ../ -DBUILD_EDITOR=ON -G Ninja && ninja install Loading @@ -93,11 +79,11 @@ RUN mkdir /usr/local/share/blogi RUN mkdir -p /var/lib/blogi-editor RUN mkdir -p /var/lib/blogi-editor/node/widgets COPY --from=build /build/runtime/docker-config.yaml /usr/local/share/blogi COPY --from=build /build/runtime/config.test.two-widget-paths.yaml /usr/local/share/blogi-editor/config.test.two-widget-paths.yaml COPY docker-config.yaml /usr/local/share/blogi COPY 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 --from=build /build/runtime/run.sh /usr/local/sbin/run.sh COPY 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 Loading