capsule.Dockerfile: uses Makefile
This commit is contained in:
+5
-7
@@ -25,20 +25,18 @@ RUN crontab -l > crontab.tmp \
|
|||||||
# bash is needed to run the build scripts
|
# bash is needed to run the build scripts
|
||||||
# busybox-openrc provides rc-service, which runs crond
|
# busybox-openrc provides rc-service, which runs crond
|
||||||
# gcc is a dependency for agate
|
# gcc is a dependency for agate
|
||||||
RUN apk --no-cache add bash busybox-openrc gcc
|
# make is needed to run the Makefile
|
||||||
|
RUN apk --no-cache add bash busybox-openrc gcc make
|
||||||
RUN rc-update add crond
|
RUN rc-update add crond
|
||||||
COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
|
COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
|
||||||
COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
|
COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
|
||||||
|
|
||||||
COPY capsule/comitium-data comitium-data
|
COPY capsule/comitium-data comitium-data
|
||||||
RUN while read feed; do \
|
COPY capsule/Makefile Makefile
|
||||||
comitium add --data comitium-data/ "$feed"; \
|
RUN make add_feeds
|
||||||
done <comitium-data/feeds.txt
|
|
||||||
COPY capsule .
|
COPY capsule .
|
||||||
COPY common /var/common
|
COPY common /var/common
|
||||||
RUN ./build_microlog.bash
|
RUN make
|
||||||
RUN ./build_longlog.bash
|
|
||||||
RUN ./build_loglog.bash
|
|
||||||
|
|
||||||
CMD \
|
CMD \
|
||||||
( ( sleep 5; comitium refresh --data comitium-data/ ) & ) \
|
( ( sleep 5; comitium refresh --data comitium-data/ ) & ) \
|
||||||
|
|||||||
Reference in New Issue
Block a user