Remove the static build for now

The static build doesn't build with clang, and its usefulness is dubious
for the time being considering the only requirement is glibc.
pull/1/head
Thomas Orozco 10 years ago
parent 958597f620
commit 699c3aadf2
  1. 1
      .travis.yml
  2. 3
      CMakeLists.txt
  3. 2
      Dockerfile
  4. 11
      README.md
  5. 2
      ci/run_build.sh
  6. 6
      ddist.sh
  7. 2
      test/test.py

@ -12,7 +12,6 @@ deploy:
secure: Yk90ANpSPv1iJy8QDXCPwfaSmEr/WIJ3bzhQ6X8JvZjfrwTosbh0HrUzQyeac3nyvNwj7YJRssolOFc21IBKPpCFTZqYxSkuLPU6ysG4HGHgN6YJhOMm4mG4KKJ6741q3DJendhZpalBhCEi+NcZK/PCSD97Vl4OqRjBUged0fs=
file:
- "./tini"
- "./tini-static"
on:
repo: krallin/tini
tags: true

@ -22,6 +22,3 @@ configure_file (
include_directories ("${PROJECT_BINARY_DIR}")
add_executable (tini tini.c)
add_executable (tini-static tini.c)
set_target_properties (tini-static PROPERTIES LINK_FLAGS "-static")

@ -1,7 +1,7 @@
FROM ubuntu
RUN apt-get update \
&& apt-get install --no-install-recommends --yes build-essential git gdb valgrind cmake \
&& apt-get install --no-install-recommends --yes build-essential git gdb valgrind cmake clang \
&& rm -rf /var/lib/apt/lists/*
ADD . /tini

@ -47,22 +47,11 @@ Assuming your entrypoint was `/docker-entrypoint.sh`, then you would use:
ENTRYPOINT ["/tini", "--", "/docker-entrypoint.sh"]
### Statically-Linked Version ###
Tini has very few dependencies (it only depends on libc), but if your
container fails to start, you might want to consider using the statically-built
version instead:
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
### Size Considerations ###
Tini is a very small file (in the 10KB range), so it doesn't add much weight
to your container.
The statically-linked version is bigger, but still < 1M.
### Building Tini ###

@ -11,7 +11,7 @@ make
# Smoke tests (actual tests need Docker to run; they don't run within the CI environment)
# Success
for tini in ./tini ./tini-static; do
for tini in ./tini; do
echo "Testing $tini with: true"
$tini -vvvv true

@ -14,12 +14,10 @@ BIN="tini"
docker build -t "${IMG}" .
# Smoke tests
# Smoke test
docker run -it --rm --entrypoint="/tini/${BIN}" "${IMG}" "-h" "--" "true"
docker run -it --rm --entrypoint="/tini/${BIN}-static" "${IMG}" "-h" "--" "true"
# Copy the binaries
# Copy the binary
docker run -it --entrypoint="/bin/true" --name="${NAME}" "${IMG}"
docker cp "${NAME}:/tini/${BIN}" "${DIST_DIR}"
docker cp "${NAME}:/tini/${BIN}-static" "${DIST_DIR}"
docker rm "${NAME}"

@ -61,7 +61,7 @@ if __name__ == "__main__":
root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
for entrypoint in ["/tini/tini", "/tini/tini-static"]:
for entrypoint in ["/tini/tini"]:
base_cmd = [
"docker",
"run",

Loading…
Cancel
Save