Fixes move ticket from sebastian wagner

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
Sebastian Waldbauer
2020-11-12 17:11:36 +01:00
parent 3a3c9769b3
commit eb1473b069
3 changed files with 3 additions and 2 deletions

View File

@@ -11,7 +11,7 @@ LABEL maintainer="Sebastian Waldbauer <waldbauer@cert.at>" \
org.label-schema.name="certat/intelmq-full" \ org.label-schema.name="certat/intelmq-full" \
org.label-schema.description="IntelMQ with core & manager" \ org.label-schema.description="IntelMQ with core & manager" \
org.label-schema.url="https://intelmq.org/" \ org.label-schema.url="https://intelmq.org/" \
org.label-schema.vcs-url="https://github.com/certtools/intelmq" \ org.label-schema.vcs-url="https://github.com/certat/intelmq-docker.git" \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="CERT.AT" \ org.label-schema.vendor="CERT.AT" \
org.label-schema.version=$BUILD_VERSION org.label-schema.version=$BUILD_VERSION

View File

@@ -10,7 +10,7 @@ If you do have any questions / feedback / questions, please open an issue :)
1. `cd ~` 1. `cd ~`
0. `mkdir intelmq_logs` 0. `mkdir intelmq_logs`
0. `sudo apt update && sudo apt upgrade -y && sudo apt install docker.io git docker-compose` 0. `sudo apt update && sudo apt upgrade -y && sudo apt install docker.io git docker-compose`
0. `git clone https://github.com/waldbauer-certat/intelmq-docker.git` 0. `git clone https://github.com/certat/intelmq-docker.git`
0. `cd intelmq-docker` 0. `cd intelmq-docker`
0. `sudo docker pull certat/intelmq-full:1.0` 0. `sudo docker pull certat/intelmq-full:1.0`
0. `chown -R $USER:$USER example_config` 0. `chown -R $USER:$USER example_config`

View File

@@ -3,6 +3,7 @@ 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 rev-parse --short HEAD)
git_ref_manager=$(cd ../intelmq-manager && git rev-parse --short HEAD) git_ref_manager=$(cd ../intelmq-manager && git rev-parse --short HEAD)
build_version="1.0" build_version="1.0"
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
echo Manager : $git_ref_manager echo Manager : $git_ref_manager