CSEC_PUBLIC/intelmq-docker
1
0
Fork 0
mirror of https://github.com/certat/intelmq-docker.git synced 2025-12-06 01:02:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Removed old git rev-parse & use git describe

Browse Source 
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
Sebastian Waldbauer
2021-04-15 12:19:52 +02:00
parent 881475c405
commit e162516a96
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ') build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
git_ref_core=$(cd ./intelmq && git rev-parse --short HEAD) git_ref_core=$(cd ./intelmq && git describe --long)
git_ref_manager=$(cd ./intelmq-manager && git rev-parse --short HEAD) git_ref_manager=$(cd ./intelmq-manager && git describe --long)
git_ref_api=$(cd ./intelmq-api && git rev-parse --short HEAD) git_ref_api=$(cd ./intelmq-api && git describe --long)
build_version="2.3.1" build_version=$(cd ./intelmq && git describe)
echo Building new IntelMQ-Image v$build_version echo Building new IntelMQ-Image v$build_version
echo Core : $git_ref_core echo Core : $git_ref_core
@@ -26,9 +26,8 @@ docker build --build-arg BUILD_DATE=$build_date \
--build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-API=$git_ref_api, IntelMQ-Manager=$git_ref_manager" \ --build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-API=$git_ref_api, IntelMQ-Manager=$git_ref_manager" \
--build-arg BUILD_VERSION=$build_version \ --build-arg BUILD_VERSION=$build_version \
-f ./.docker/intelmq-full/Dockerfile \ -f ./.docker/intelmq-full/Dockerfile \
-t intelmq-full:$build_version \
-t intelmq-full:latest . -t intelmq-full:latest .
cd ./intelmq-manager \ cd ./intelmq-manager \
&& rm -r html \ && rm -r html \
&& cd .. && cd ..

6
versions.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
intelmq_full_built=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.created" }}' intelmq-full:1.0) intelmq_full_built=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.created" }}' intelmq-full:latest)
intelmq_full_vers=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.version" }}' intelmq-full:1.0) intelmq_full_vers=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.version" }}' intelmq-full:latest)
intelmq_full_rev=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.revision" }}' intelmq-full:1.0) intelmq_full_rev=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.revision" }}' intelmq-full:latest)
echo IntelMQ built at \"$intelmq_full_built\" \(Version $intelmq_full_vers\) echo IntelMQ built at \"$intelmq_full_built\" \(Version $intelmq_full_vers\)
revisions=$(echo $intelmq_full_rev | tr "," "\n") revisions=$(echo $intelmq_full_rev | tr "," "\n")