From 8a54fb4e99dd96536ae015c96dcc79b2a842b153 Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Tue, 14 May 2024 09:25:25 +0200 Subject: [PATCH] rm .dockerignore and bring back stock Dockerfile and Makefile --- .dockerignore | 6 ------ .gitmodules | 0 Dockerfile | 2 +- Makefile | 6 +----- 4 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .gitmodules diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 5474fb4..0000000 --- a/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -.git -lnd/.git -configurator -!configurator/target/**/release/configurator -health-check -!health-check/target/**/release/health-check diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/Dockerfile b/Dockerfile index 27f0c5a..8584f6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,4 +26,4 @@ RUN chmod a+x /usr/local/bin/*.sh WORKDIR /root -ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"] +ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"] \ No newline at end of file diff --git a/Makefile b/Makefile index 62960d4..3aed3e8 100644 --- a/Makefile +++ b/Makefile @@ -45,24 +45,20 @@ docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh configurator/target/a docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --platform=linux/arm64 --build-arg ARCH=aarch64 -o type=docker,dest=docker-images/aarch64.tar . configurator/target/aarch64-unknown-linux-musl/release/configurator: $(CONFIGURATOR_SRC) - @echo; echo 111; ls -alR /home docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:aarch64-musl musl-strip target/aarch64-unknown-linux-musl/release/configurator health-check/target/aarch64-unknown-linux-musl/release/health-check: $(HEALTH_CHECK_SRC) - @echo; echo 222; ls -alR /home docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:aarch64-musl musl-strip target/aarch64-unknown-linux-musl/release/health-check configurator/target/x86_64-unknown-linux-musl/release/configurator: $(CONFIGURATOR_SRC) - @echo; echo 333; ls -alR /home docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl musl-strip target/x86_64-unknown-linux-musl/release/configurator health-check/target/x86_64-unknown-linux-musl/release/health-check: $(HEALTH_CHECK_SRC) - @echo; echo 444; ls -alR /home docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:x86_64-musl musl-strip target/x86_64-unknown-linux-musl/release/health-check scripts/embassy.js: scripts/**/*.ts - deno bundle scripts/embassy.ts scripts/embassy.js + deno bundle scripts/embassy.ts scripts/embassy.js \ No newline at end of file