christoph/fail
1
Fork 0
Code Releases Activity

dockerfile: don't cache fail/fail-targets clones

Browse Source
This commit is contained in:
Christoph Urlacher
2026-01-18 19:19:42 +01:00
parent 569ee2b898
commit 06f7346533
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/docker/Makefile
View File

@ -1,7 +1,7 @@
build-all: build-all:
docker build -t danceos/fail-base fail-base docker build -t danceos/fail-base fail-base --build-arg CACHE_DATE="$(shell date)"
docker build -t danceos/fail-generic-tracing fail-generic-tracing docker build -t danceos/fail-generic-tracing fail-generic-tracing
docker build -t danceos/fail-demo fail-demo docker build -t danceos/fail-demo fail-demo --build-arg CACHE_DATE="$(shell date)"
run-all: .compose ssh run-all: .compose ssh

4
scripts/docker/fail-base/Dockerfile
View File

@ -119,10 +119,14 @@ RUN wget http://www.aspectc.org/releases/"$acversion"/ac-bin-linux-x86-64bit-"$a
ENV PATH=/home/fail/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH=/home/fail/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Clone FAIL* # Clone FAIL*
# Break docker layer cache
ARG CACHE_DATE=1970-01-01
# RUN git clone https://github.com/danceos/fail.git # RUN git clone https://github.com/danceos/fail.git
RUN git clone https://gitea.vps.chriphost.de/christoph/fail RUN git clone https://gitea.vps.chriphost.de/christoph/fail
WORKDIR fail WORKDIR fail
USER root USER root
# Accept SSH connections
EXPOSE 22 EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"] CMD ["/usr/sbin/sshd", "-D"]

17
scripts/docker/fail-demo/Dockerfile
View File

@ -16,9 +16,6 @@ WORKDIR /home/fail
RUN echo 'export PATH=$HOME/bin:$PATH' >> ~/.profile \ RUN echo 'export PATH=$HOME/bin:$PATH' >> ~/.profile \
&& echo 'cd $HOME/fail-targets' >> ~/.profile && echo 'cd $HOME/fail-targets' >> ~/.profile
# RUN git clone https://github.com/danceos/fail-targets.git
RUN git clone https://gitea.vps.chriphost.de/christoph/fail-targets
WORKDIR fail WORKDIR fail
RUN mkdir build; cd build RUN mkdir build; cd build
WORKDIR build WORKDIR build
@ -135,6 +132,7 @@ RUN apt-get update \
unzip \ unzip \
&& apt-get clean && apt-get clean
# Fix old shebangs
RUN ln -sf /usr/bin/python2 /usr/bin/python RUN ln -sf /usr/bin/python2 /usr/bin/python
# Install python packages # Install python packages
@ -143,5 +141,16 @@ RUN wget https://bootstrap.pypa.io/pip/2.7/get-pip.py \
&& wget https://raw.githubusercontent.com/paulfitz/mysql-connector-c/master/include/my_config.h -O /usr/include/mysql/my_config.h \ && wget https://raw.githubusercontent.com/paulfitz/mysql-connector-c/master/include/my_config.h -O /usr/include/mysql/my_config.h \
&& pip2 install flask pyyaml MySQL-python && pip2 install flask pyyaml MySQL-python
# For the resultbrowser, we expose port 5000 to the outside world. USER fail
# Clone FAIL* targets
# Break docker layer cache
ARG CACHE_DATE=1970-01-01
WORKDIR /home/fail
# RUN git clone https://github.com/danceos/fail-targets.git
RUN git clone https://gitea.vps.chriphost.de/christoph/fail-targets
USER root
# Resultbrowser
EXPOSE 5000 EXPOSE 5000