Skip to content

Commit

Permalink
build: switch to build args over env vars in dockerfile
Browse files Browse the repository at this point in the history
`--env` is a podman-specific feature. While it is clear that podman is a requirement here, switching these to build arguments better expresses intent.

These values are meant to be configurable at build time, which is exactly what build arguments are for, while environment variables are meant to persist in the image built.

Additionally, this removes unused env vars.

Signed-off-by: Yorgos Saslis <[email protected]>
  • Loading branch information
gsaslis authored and sebastinez committed Jun 20, 2024
1 parent a4e0d21 commit 730f7ae
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
11 changes: 10 additions & 1 deletion radicle-httpd/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ LABEL maintainer="Radicle Team <[email protected]>"
WORKDIR /src
COPY . .

ARG TZ
ARG LC_ALL
ARG SOURCE_DATE_EPOCH
ARG RADICLE_VERSION

# Copy cargo configuration we're going to use to specify compiler options.
RUN mkdir -p .cargo && cp build/config.toml .cargo/config.toml
# Install dependencies.
Expand Down Expand Up @@ -49,6 +54,10 @@ RUN cargo zigbuild --locked --release \
# Now copy the files to a new image without all the intermediary artifacts to
# save some space.
FROM alpine:3.19 as packager

ARG RADICLE_VERSION
ARG SOURCE_DATE_EPOCH

COPY --from=builder \
/src/target/x86_64-unknown-linux-musl/release/rad-web \
/src/target/x86_64-unknown-linux-musl/release/radicle-httpd \
Expand Down Expand Up @@ -77,7 +86,7 @@ RUN find * -maxdepth 0 -type d -exec mv '{}' "radicle-$RADICLE_VERSION-{}" \; &&
find * -maxdepth 0 -type d -exec tar \
--sort=name \
--verbose \
--mtime="@$GIT_COMMIT_TIME" \
--mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 \
--group=0 \
--numeric-owner \
Expand Down
20 changes: 8 additions & 12 deletions radicle-httpd/build/build
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,21 @@ main() {
case "$OS" in
Darwin)
podman build \
--env SOURCE_DATE_EPOCH \
--env TZ \
--env LC_ALL \
--env GIT_COMMIT_TIME=$SOURCE_DATE_EPOCH \
--env GIT_HEAD=$rev \
--env RADICLE_VERSION=$version \
--build-arg SOURCE_DATE_EPOCH \
--build-arg TZ \
--build-arg LC_ALL \
--build-arg RADICLE_VERSION=$version \
--arch aarch64 --tag $image -f ./build/Dockerfile - <$gitarchive

echo "Creating container (radicle-build-container).."
podman create --ulimit=host --replace --name radicle-build-container $image
;;
*)
podman --cgroup-manager=cgroupfs build \
--env SOURCE_DATE_EPOCH \
--env TZ \
--env LC_ALL \
--env GIT_COMMIT_TIME=$SOURCE_DATE_EPOCH \
--env GIT_HEAD=$rev \
--env RADICLE_VERSION=$version \
--build-arg SOURCE_DATE_EPOCH \
--build-arg TZ \
--build-arg LC_ALL \
--build-arg RADICLE_VERSION=$version \
--arch amd64 --tag $image -f ./build/Dockerfile - <$gitarchive

echo "Creating container (radicle-build-container).."
Expand Down

0 comments on commit 730f7ae

Please sign in to comment.