Mitch Bailey
08/30/2021, 4:28 AMdocker_build/docker/magic/Dockerfile
to the commit that I wanted and ran
make build-magic
make merge
However, it doesn't seem to have an effect now. It says it's updating from the specified commit, but then uses the old one. Here's the Dockerfile commits.
# 8.3.183
#ARG MAGIC_COMMIT=958d6f16701c1ee25e27440381b5c2c37b5fee7c
# 8.3.203
ARG MAGIC_COMMIT=0ebdf3e513030119bc6f1973aae3b23556233e8d
Here's the log (it seems to say that it wants to checkout 0edbf3e
)
Step 9/17 : ARG MAGIC_COMMIT=0ebdf3e513030119bc6f1973aae3b23556233e8d
---> Using cache
---> c149387ca9d7
Step 10/17 : RUN git clone ${MAGIC_REPO} magic_21083013
---> Running in 6e01b4b63b9c
Cloning into 'magic_21083013'...
Removing intermediate container 6e01b4b63b9c
---> 27e888109946
Step 11/17 : WORKDIR magic_21083013
---> Running in 72dd67881957
Removing intermediate container 72dd67881957
---> 5e9be585c251
Step 12/17 : RUN git checkout ${MAGIC_COMMIT}
---> Running in c0137702ecce
Note: checking out '958d6f16701c1ee25e27440381b5c2c37b5fee7c'.
See how it checked out the wrong commit? And finally, build/version/magic.version
Build Timestamp: 2021-08-30_03-32-54
958d6f16701c1ee25e27440381b5c2c37b5fee7c
@User Any idea where the old commit is coming from?
I did find the old commit in tar/tool_metadata.yml
.
Does this file now override the individual Dockerfiles?Manar Abdelatty
08/30/2021, 6:26 AMMitch Bailey
08/30/2021, 8:37 AMManar Abdelatty
08/30/2021, 3:59 PM