This is an automated email from the ASF dual-hosted git repository.
xikai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-horaedb.git
The following commit(s) were added to refs/heads/main by this push:
new 54a5db72 chore: remove tini binary (#1503)
54a5db72 is described below
commit 54a5db725e674934ca490a64118d50df1b1f4cde
Author: Jiacai Liu <[email protected]>
AuthorDate: Mon Mar 18 19:05:23 2024 +0800
chore: remove tini binary (#1503)
## Rationale
Our repo should not contain any binaries.
## Detailed Changes
- Download tini instead of hard copy
## Test Plan
CI
Also I use command below to ensure no other binaries exists.
```
fd -t file --exclude target --exec file {} \; | grep -v ASCII | grep -v
UTF-8
```
---
.gitignore | 1 +
Dockerfile | 3 ++-
docker/tini | Bin 24064 -> 0 bytes
horaemeta/Dockerfile | 3 ++-
horaemeta/docker/tini | Bin 24064 -> 0 bytes
5 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1cdba5be..f3b4b08a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ integration_tests/dist_query/output
.tools
bin
coverage.txt
+tini
diff --git a/Dockerfile b/Dockerfile
index 0de3d643..6e94e51a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,8 @@ RUN chmod +x /usr/bin/horaedb-server
COPY ./docker/entrypoint.sh /entrypoint.sh
COPY ./docs/minimal.toml /etc/horaedb/horaedb.toml
-COPY ./docker/tini /tini
+ARG TINI_VERSION=v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini
/tini
RUN chmod +x /tini
ARG USER=horae
diff --git a/docker/tini b/docker/tini
deleted file mode 100644
index 03af82f0..00000000
Binary files a/docker/tini and /dev/null differ
diff --git a/horaemeta/Dockerfile b/horaemeta/Dockerfile
index 5841c2a8..9512582a 100644
--- a/horaemeta/Dockerfile
+++ b/horaemeta/Dockerfile
@@ -44,7 +44,8 @@ RUN chmod +x /usr/bin/horaemeta-server
COPY ./docker/entrypoint.sh /entrypoint.sh
COPY ./config/example-standalone.toml /etc/horaemeta/horaemeta.toml
-COPY ./docker/tini /tini
+ARG TINI_VERSION=v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini
/tini
RUN chmod +x /tini
ARG USER horae
diff --git a/horaemeta/docker/tini b/horaemeta/docker/tini
deleted file mode 100644
index 03af82f0..00000000
Binary files a/horaemeta/docker/tini and /dev/null differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]