From 5ac918bab3618d0263a7824acc3c2315f3f558d5 Mon Sep 17 00:00:00 2001 From: Samuel Hassine Date: Sun, 26 Dec 2021 20:43:34 +0100 Subject: [PATCH] [integration] Adapt CI workflow to new connectors --- .circleci/config.yml | 37 ++++++++++++++++++- external-import/siemrules/docker-compose.yml | 2 +- .../siemrules/src/requirements.txt | 2 +- external-import/stixify/docker-compose.yml | 2 +- external-import/stixify/src/requirements.txt | 2 +- external-import/vulmatch/docker-compose.yml | 2 +- external-import/vulmatch/src/requirements.txt | 2 +- .../export-report-pdf/Dockerfile | 2 +- 8 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60d6448a32..729095ffb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -251,7 +251,19 @@ jobs: - run: working_directory: ~/opencti/external-import/obstracts name: Build Docker image opencti/connector-obstracts - command: docker build -t opencti/connector-obstracts:latest . && docker tag opencti/connector-obstracts:latest opencti/connector-obstracts:${CIRCLE_TAG} + command: docker build -t opencti/connector-obstracts:latest . && docker tag opencti/connector-obstracts:latest opencti/connector-obstracts:${CIRCLE_TAG} + - run: + working_directory: ~/opencti/external-import/stixify + name: Build Docker image opencti/connector-stixify + command: docker build -t opencti/connector-stixify:latest . && docker tag opencti/connector-stixify:latest opencti/connector-stixify:${CIRCLE_TAG} + - run: + working_directory: ~/opencti/external-import/siemrules + name: Build Docker image opencti/connector-siemrules + command: docker build -t opencti/connector-siemrules:latest . && docker tag opencti/connector-siemrules:latest opencti/connector-siemrules:${CIRCLE_TAG} + - run: + working_directory: ~/opencti/external-import/vulmatch + name: Build Docker image opencti/connector-vulmatch + command: docker build -t opencti/connector-vulmatch:latest . && docker tag opencti/connector-vulmatch:latest opencti/connector-vulmatch:${CIRCLE_TAG} - run: name: Publish Docker Image to Docker Hub command: | @@ -365,7 +377,13 @@ jobs: docker push opencti/connector-export-report-pdf:latest docker push opencti/connector-export-report-pdf:${CIRCLE_TAG} docker push opencti/connector-obstracts:latest - docker push opencti/connector-obstracts:${CIRCLE_TAG} + docker push opencti/connector-obstracts:${CIRCLE_TAG} + docker push opencti/connector-stixify:latest + docker push opencti/connector-stixify:${CIRCLE_TAG} + docker push opencti/connector-siemrules:latest + docker push opencti/connector-siemrules:${CIRCLE_TAG} + docker push opencti/connector-vulmatch:latest + docker push opencti/connector-vulmatch:${CIRCLE_TAG} build_rolling: working_directory: ~/opencti docker: @@ -593,6 +611,18 @@ jobs: working_directory: ~/opencti/external-import/obstracts name: Build Docker image opencti/obstracts command: docker build -t opencti/obstracts:rolling . + - run: + working_directory: ~/opencti/external-import/stixify + name: Build Docker image opencti/stixify + command: docker build -t opencti/stixify:rolling . + - run: + working_directory: ~/opencti/external-import/vulmatch + name: Build Docker image opencti/vulmatch + command: docker build -t opencti/vulmatch:rolling . + - run: + working_directory: ~/opencti/external-import/siemrules + name: Build Docker image opencti/siemrules + command: docker build -t opencti/siemrules:rolling . - run: name: Publish Docker Image to Docker Hub command: | @@ -652,6 +682,9 @@ jobs: docker push opencti/connector-urlhaus-recent-payloads:rolling docker push opencti/export-report-pdf:rolling docker push opencti/obstracts:rolling + docker push opencti/stixify:rolling + docker push opencti/vulmatch:rolling + docker push opencti/siemrules:rolling workflows: version: 2 opencti: diff --git a/external-import/siemrules/docker-compose.yml b/external-import/siemrules/docker-compose.yml index f8cb864b01..6871669d3e 100644 --- a/external-import/siemrules/docker-compose.yml +++ b/external-import/siemrules/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: connector-taxii2: - image: opencti/connector-siemrules:5.1.2 + image: opencti/connector-siemrules:5.1.3 environment: - OPENCTI_URL=http://opencti:8080 - OPENCTI_TOKEN=CHANGME diff --git a/external-import/siemrules/src/requirements.txt b/external-import/siemrules/src/requirements.txt index 62024f246b..b95a705db6 100644 --- a/external-import/siemrules/src/requirements.txt +++ b/external-import/siemrules/src/requirements.txt @@ -1,4 +1,4 @@ -pycti==5.1.2 +pycti==5.1.3 antlr4-python3-runtime certifi chardet diff --git a/external-import/stixify/docker-compose.yml b/external-import/stixify/docker-compose.yml index b097f406c8..6e3d85484d 100644 --- a/external-import/stixify/docker-compose.yml +++ b/external-import/stixify/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: connector-taxii2: - image: opencti/connector-stixify:5.1.2 + image: opencti/connector-stixify:5.1.3 environment: - OPENCTI_URL=http://opencti:8080 - OPENCTI_TOKEN=CHANGME diff --git a/external-import/stixify/src/requirements.txt b/external-import/stixify/src/requirements.txt index 62024f246b..b95a705db6 100644 --- a/external-import/stixify/src/requirements.txt +++ b/external-import/stixify/src/requirements.txt @@ -1,4 +1,4 @@ -pycti==5.1.2 +pycti==5.1.3 antlr4-python3-runtime certifi chardet diff --git a/external-import/vulmatch/docker-compose.yml b/external-import/vulmatch/docker-compose.yml index fa6e5265c4..f5dc3cb1d9 100644 --- a/external-import/vulmatch/docker-compose.yml +++ b/external-import/vulmatch/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: connector-taxii2: - image: opencti/connector-vulmatch:5.1.2 + image: opencti/connector-vulmatch:5.1.3 environment: - OPENCTI_URL=http://opencti:8080 - OPENCTI_TOKEN=CHANGME diff --git a/external-import/vulmatch/src/requirements.txt b/external-import/vulmatch/src/requirements.txt index 62024f246b..b95a705db6 100644 --- a/external-import/vulmatch/src/requirements.txt +++ b/external-import/vulmatch/src/requirements.txt @@ -1,4 +1,4 @@ -pycti==5.1.2 +pycti==5.1.3 antlr4-python3-runtime certifi chardet diff --git a/internal-export-file/export-report-pdf/Dockerfile b/internal-export-file/export-report-pdf/Dockerfile index 1af6d94642..5fb52137cf 100644 --- a/internal-export-file/export-report-pdf/Dockerfile +++ b/internal-export-file/export-report-pdf/Dockerfile @@ -5,7 +5,7 @@ COPY src /opt/opencti-connector-export-report-pdf # Install Python modules # hadolint ignore=DL3003 -RUN apk --no-cache add git build-base libmagic libffi-dev && \ +RUN apk --no-cache add git build-base libmagic libffi-dev zlib-dev && \ cd /opt/opencti-connector-export-report-pdf && \ pip3 install --no-cache-dir -r requirements.txt && \ apk del git build-base