mirror of
https://github.com/certat/intelmq-docker.git
synced 2025-12-07 17:52:55 +01:00
[ENH] Updated IntelMQ-Full
Now we're using the api instead of the manager. This is future proof & will be updated constantly. Removed manager config & added api config Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> [NGINX] Added default webserver (nginx) Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> Updated intelmq-full docker image Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> Changed build process Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> Updated utils Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> Fixed entrypoint Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> Updated docker-compose Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at> Misc Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
24
build.sh
24
build.sh
@@ -2,18 +2,34 @@
|
||||
build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
|
||||
git_ref_core=$(cd ../intelmq && git rev-parse --short HEAD)
|
||||
git_ref_manager=$(cd ../intelmq-manager && git rev-parse --short HEAD)
|
||||
git_ref_api=$(cd ../intelmq-api && git rev-parse --short HEAD)
|
||||
build_version="1.0"
|
||||
|
||||
echo Building new IntelMQ-Image v$build_version
|
||||
echo Core : $git_ref_core
|
||||
echo Manager : $git_ref_manager
|
||||
echo Api : $git_ref_api
|
||||
echo Build_date: $build_date
|
||||
|
||||
cp -r ../intelmq ./intelmq
|
||||
cp -r ../intelmq-manager ./intelmq-manager
|
||||
cp -R ../intelmq ./intelmq
|
||||
|
||||
# build static html
|
||||
cp -R ../intelmq-manager ./intelmq-manager
|
||||
cd ./intelmq-manager \
|
||||
&& python3 setup.py build \
|
||||
&& cp -R ./html ../example_config/nginx/html \
|
||||
&& cd ..
|
||||
|
||||
cp -R ../intelmq-api ./intelmq-api
|
||||
|
||||
docker build --build-arg BUILD_DATE=$build_date \
|
||||
--build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-Manager=$git_ref_manager" \
|
||||
--build-arg VCS_REF="IntelMQ-Manager=$git_ref_manager" \
|
||||
--build-arg BUILD_VERSION=$build_version \
|
||||
-f Dockerfile \
|
||||
-f ./.docker/nginx/Dockerfile \
|
||||
-t intelmq-nginx:latest .
|
||||
|
||||
docker build --build-arg BUILD_DATE=$build_date \
|
||||
--build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-API=$git_ref_api" \
|
||||
--build-arg BUILD_VERSION=$build_version \
|
||||
-f ./.docker/intelmq-full/Dockerfile \
|
||||
-t intelmq-full:$build_version .
|
||||
|
||||
Reference in New Issue
Block a user