Skip to content

Commit

Permalink
fix version detection for docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
itaysk committed Nov 26, 2020
1 parent 8d0ac30 commit e210c72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Expand Up @@ -6,7 +6,9 @@ RUN echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >> /etc/
(for tool in "clang" "llc" "llvm-strip"; do path=$(which $tool-9) && ln -s $path ${path%-*}; done)
WORKDIR /tracee

ARG VERSION
FROM tracee-builder as build
ENV VERSION=$VERSION
COPY . /tracee
RUN make build

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -152,11 +152,11 @@ check_%:

.PHONY: docker
docker:
$(CMD_DOCKER) build -t $(OUT_DOCKER):latest .
$(CMD_DOCKER) build --build-arg VERSION=$(VERSION) -t $(OUT_DOCKER):latest .

.PHONY: docker-slim
docker-slim:
$(CMD_DOCKER) build -t $(OUT_DOCKER):slim --build-arg BASE=slim .
$(CMD_DOCKER) build --build-arg VERSION=$(VERSION) -t $(OUT_DOCKER):slim --build-arg BASE=slim .

# release_docker_image accepts a local docker image reference (first argument), pushes it under a new name (second argument) to remote repository, and records it in the release notes
define release_docker_image
Expand Down

0 comments on commit e210c72

Please sign in to comment.