Skip to content

Commit

Permalink
Merge branch 'release/4.0.1' into master-th4
Browse files Browse the repository at this point in the history
  • Loading branch information
To-om committed Nov 13, 2020
2 parents a97aa3e + a5e7480 commit 96defcb
Show file tree
Hide file tree
Showing 425 changed files with 12,283 additions and 9,736 deletions.
66 changes: 36 additions & 30 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ steps:
- name: build-packages
image: thehiveproject/drone-scala-node
settings:
pgp_key:
from_secret: pgp_key
pgp_key: {from_secret: pgp_key}
commands:
- |
V=$(sbt -no-colors --error "print thehive/version" | tail -1)
Expand All @@ -76,14 +75,10 @@ steps:
- name: send packages
image: appleboy/drone-scp
settings:
host:
from_secret: scp_host
username:
from_secret: scp_user
key:
from_secret: scp_key
target:
from_secret: incoming_path
host: {from_secret: package_host}
username: {from_secret: package_user}
key: {from_secret: package_key}
target: {from_secret: incoming_path}
source:
- target/thehive*.deb
- target/thehive*.rpm
Expand All @@ -96,14 +91,10 @@ steps:
- name: publish packages
image: appleboy/drone-ssh
settings:
host:
from_secret: scp_host
user:
from_secret: scp_user
key:
from_secret: scp_key
publish_script:
from_secret: publish_script
host: {from_secret: package_host}
user: {from_secret: package_user}
key: {from_secret: package_key}
publish_script: {from_secret: publish_script}
commands:
- PLUGIN_SCRIPT="bash $PLUGIN_PUBLISH_SCRIPT thehive4 $(cat thehive-version.txt)" /bin/drone-ssh
when:
Expand All @@ -116,10 +107,8 @@ steps:
context: target/docker/stage
dockerfile: target/docker/stage/Dockerfile
repo: thehiveproject/thehive4
username:
from_secret: docker_username
password:
from_secret: docker_password
username: {from_secret: docker_username}
password: {from_secret: docker_password}
when:
event: [tag]

Expand All @@ -129,17 +118,34 @@ steps:
settings:
context: target/docker/stage
dockerfile: target/docker/stage/Dockerfile
registry:
from_secret: harbor_server
repo:
from_secret: harbor_repo
username:
from_secret: harbor_username
password:
from_secret: harbor_password
registry: {from_secret: harbor_registry}
repo: {from_secret: harbor_repo}
username: {from_secret: harbor_username}
password: {from_secret: harbor_password}
when:
event: [tag]

- name: send message
image: thehiveproject/drone_keybase
settings:
username: {from_secret: keybase_username}
paperkey: {from_secret: keybase_paperkey}
channel: {from_secret: keybase_channel}
commands:
- |
keybase oneshot -u "$PLUGIN_USERNAME" --paperkey "$PLUGIN_PAPERKEY"
URL="$DRONE_SYSTEM_PROTO://$DRONE_SYSTEM_HOST/$DRONE_REPO/$DRONE_BUILD_NUMBER"
if [ $DRONE_BUILD_STATUS = "success" ]
then
keybase chat send "$PLUGIN_CHANNEL" ":white_check_mark: $DRONE_REPO: build succeeded $URL"
else
keybase chat send "$PLUGIN_CHANNEL" ":x: $DRONE_REPO: build failed $URL"
fi
when:
status:
- success
- failure

volumes:
- name: cache
host:
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUNNING_PID
.cache-main
.cache-tests
sbt-launch.jar
.bsp/

# Eclipse
.project
Expand All @@ -37,4 +38,8 @@ tmp
!/.idea/runConfigurations/
!/.idea/runConfigurations/*

dev
# VSCode
.vscode/
.bloop/
.metals/
metals.sbt
50 changes: 0 additions & 50 deletions .idea/runConfigurations/Cortex_tests.xml

This file was deleted.

34 changes: 0 additions & 34 deletions .idea/runConfigurations/Misp_tests.xml

This file was deleted.

60 changes: 0 additions & 60 deletions .idea/runConfigurations/Scalligraph_tests.xml

This file was deleted.

30 changes: 0 additions & 30 deletions .idea/runConfigurations/TheHive.xml

This file was deleted.

Loading

0 comments on commit 96defcb

Please sign in to comment.