diff --git a/.gitignore b/.gitignore index 6f394c0e..e3d52da5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ *.pyc *.swp *~ -Makefile build build-* .deps diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..6d7e7190 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +docker: + docker build -t fail-base -f fail-base.dockerfile . --build-arg CACHE_DATE="$(shell date)" + docker build -t fail-generic-tracing -f fail-generic-tracing.dockerfile . + docker build -t fail-demo -f fail-demo.dockerfile . --build-arg CACHE_DATE="$(shell date)" + +run: .compose ssh + +.compose: + docker compose up -d --force-recreate --renew-anon-volumes -y + +ssh: + ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 5022 fail@127.0.0.1 diff --git a/scripts/docker/docker-compose.yaml b/docker-compose.yaml similarity index 100% rename from scripts/docker/docker-compose.yaml rename to docker-compose.yaml diff --git a/scripts/docker/fail-base/Dockerfile b/fail-base.dockerfile similarity index 100% rename from scripts/docker/fail-base/Dockerfile rename to fail-base.dockerfile diff --git a/scripts/docker/fail-demo/Dockerfile b/fail-demo.dockerfile similarity index 97% rename from scripts/docker/fail-demo/Dockerfile rename to fail-demo.dockerfile index d1127dd6..2bbe8774 100644 --- a/scripts/docker/fail-demo/Dockerfile +++ b/fail-demo.dockerfile @@ -14,7 +14,7 @@ RUN chown fail /home/fail/.my.cnf USER fail WORKDIR /home/fail RUN echo 'export PATH=$HOME/bin:$PATH' >> ~/.profile \ - && echo 'cd $HOME/fail-targets' >> ~/.profile + && echo 'cd $HOME/fail-wasm/examples' >> ~/.profile WORKDIR fail RUN mkdir build; cd build @@ -149,6 +149,7 @@ 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 +RUN git clone https://gitea.vps.chriphost.de/christoph/fail-wasm USER root diff --git a/scripts/docker/fail-generic-tracing/Dockerfile b/fail-generic-tracing.dockerfile similarity index 100% rename from scripts/docker/fail-generic-tracing/Dockerfile rename to fail-generic-tracing.dockerfile diff --git a/scripts/docker/fail-demo/my.cnf b/my.cnf similarity index 100% rename from scripts/docker/fail-demo/my.cnf rename to my.cnf diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile deleted file mode 100644 index 93d7b550..00000000 --- a/scripts/docker/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -build-all: - docker build -t fail-base fail-base --build-arg CACHE_DATE="$(shell date)" - docker build -t fail-generic-tracing fail-generic-tracing - docker build -t fail-demo fail-demo --build-arg CACHE_DATE="$(shell date)" - -run-all: .compose ssh - -.compose: - docker compose up -d --force-recreate --renew-anon-volumes -y - -ssh: - ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 5022 fail@127.0.0.1