summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAndreas Fankhauser hiddenalpha.ch2022-08-23 23:07:34 +0200
committerAndreas Fankhauser hiddenalpha.ch2022-08-23 23:07:34 +0200
commit33940d2cde706cf6b061a0920e7b936d41edb0de (patch)
treea1453cf5947fcd84ddd9da4d57612f5890ab7ed3 /contrib
parented9d8f294b7d655886dc372d31c2479a7b527482 (diff)
downloadbulk-ln-33940d2cde706cf6b061a0920e7b936d41edb0de.zip
bulk-ln-33940d2cde706cf6b061a0920e7b936d41edb0de.tar.gz
Cleanup
- Fix version string while dockerbuild. - Use quotes in log msgs. - Add apt cleanup in debian build example. - Fix off-by-one error in summary log msg. - Allow to clone by tag within Dockerfile. - Add some missing LFs in err msgs.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/build-using-docker/Dockerfile4
-rw-r--r--contrib/build-using-docker/README.md6
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/build-using-docker/Dockerfile b/contrib/build-using-docker/Dockerfile
index c56cacd..00c1132 100644
--- a/contrib/build-using-docker/Dockerfile
+++ b/contrib/build-using-docker/Dockerfile
@@ -2,7 +2,7 @@
ARG PARENT_IMAGE=alpine:3.16.0
FROM $PARENT_IMAGE
-ARG GIT_TAG=
+ARG GIT_TAG=master
ARG CONFIGURE_OPTS=
ARG PKGINIT=true
ARG PKGADD="apk add"
@@ -16,7 +16,7 @@ WORKDIR /work
RUN true \
&& $PKGINIT \
&& $PKGADD $PKGS_TO_ADD \
- && git clone --depth 1 https://github.com/hiddenalpha/bulk-ln.git . \
+ && git clone --depth 42 --branch "${GIT_TAG:?}" https://github.com/hiddenalpha/bulk-ln.git . \
&& git config advice.detachedHead false \
&& if test -n "$GIT_TAG"; then git checkout "$GIT_TAG"; fi \
&& ./configure $CONFIGURE_OPTS \
diff --git a/contrib/build-using-docker/README.md b/contrib/build-using-docker/README.md
index 35f7429..63b7182 100644
--- a/contrib/build-using-docker/README.md
+++ b/contrib/build-using-docker/README.md
@@ -24,7 +24,7 @@ curl -sSL http://git.hiddenalpha.ch/bulk-ln.git/plain/contrib/build-using-docker
## Grab distribution archive
Most probably we wanna get the distribution archive. We can copy it out the
-dockerimage to our host using:
+dockerimage into our working dir on the host using:
```sh
sudo docker run --rm -i "${IMG:?}" sh -c 'true && cd dist && tar c *' | tar x
@@ -51,10 +51,10 @@ differently if you need to keep multiple images.
curl -sSL http://git.hiddenalpha.ch/bulk-ln.git/plain/contrib/build-using-docker/Dockerfile | sudo docker build . -f - -t "${IMG:?}" \
--build-arg PARENT_IMAGE=debian:buster-20220622-slim \
--build-arg PKGS_TO_ADD="curl gcc git make libc-dev ca-certificates tar" \
- --build-arg PKGS_TO_DEL="curl gcc git make libc-dev ca-certificates" \
+ --build-arg PKGS_TO_DEL="curl gcc git make libc-dev" \
--build-arg PKGINIT="apt update" \
--build-arg PKGADD="apt install -y --no-install-recommends" \
- --build-arg PKGDEL=true \
+ --build-arg PKGDEL="apt purge -y" \
--build-arg PKGCLEAN="apt clean"
```