Skip to content

Commit

Permalink
Feat/MDD-220: Improve Proxy Docker Container (#18)
Browse files Browse the repository at this point in the history
## Feat/MDD-220: Improve Proxy Docker Container
### Update Information
This release added a new misp-dockerized-proxy Docker container.
### General Changes
The general CI files were changed.
- Changed Gitlab CI Build tools from default `docker build`  to `kaniko`
- Added a Gitlab CI test job for all container 
- Added a Release Date variable for all container 
- Removed unused CI scripts
### Fixes and Improvements
- Added new misp-dockerized-proxy:1.6-alpine Docker container
### Detailed Changes
- Added new misp-dockerized-proxy:1.6-alpine Docker container
  This container supports: 
  - Our MISP-dockerized-monitoring as reverse proxy. 
  - The new MISP-dockerized variable scheme.
  - SSL web certificate passphrase option.
  • Loading branch information
8ear committed Jul 2, 2019
1 parent 990c538 commit 8093b59
Show file tree
Hide file tree
Showing 44 changed files with 531 additions and 951 deletions.
24 changes: 0 additions & 24 deletions .ci/01_before_install.sh

This file was deleted.

85 changes: 0 additions & 85 deletions .ci/02_build.sh

This file was deleted.

121 changes: 0 additions & 121 deletions .ci/03_tagging.sh

This file was deleted.

50 changes: 0 additions & 50 deletions .ci/04_push.sh

This file was deleted.

11 changes: 0 additions & 11 deletions .ci/05_notify_hub.docker.com.sh

This file was deleted.

26 changes: 0 additions & 26 deletions .ci/Makefile

This file was deleted.

56 changes: 12 additions & 44 deletions .gitlab-ci.yml
@@ -1,54 +1,22 @@
image: docker:latest

services:
- docker:dind

stages:
- test
- build
notify:
extends: .notify

variables:
# The following variables are setup via gitlab project group:
# DOCKER_HUB_NOTIFY_URL
# DOCKER_SLUG
# DOCKER_USERNAME
# DOCKER_PASSWORD
# CUSTOM_REGISTRY_URL
# CUSTOM_REGISTRY_USER
# CUSTOM_REGISTRY_PW

before_script:
- .ci/01_before_install.sh

.test:
stage: test
except:
- master
script:
- make -C .ci build v=$VERSION
- make -C .ci tags REPOURL=$CUSTOM_REGISTRY_URL
- make -C .ci tags REPOURL=$DOCKER_SLUG

.build:
stage: build
only:
- master
script:
- make -C .ci build v=$VERSION
- make -C .ci tags REPOURL=$CUSTOM_REGISTRY_URL
- make -C .ci tags REPOURL=$DOCKER_SLUG
- make -C .ci push REPOURL=$CUSTOM_REGISTRY_URL USER=$CUSTOM_REGISTRY_USER PW=$CUSTOM_REGISTRY_PW
- make -C .ci push REPOURL=$DOCKER_SLUG USER=$DOCKER_USERNAME PW=$DOCKER_PASSWORD
- make -C .ci notify-hub-docker-com URL=$DOCKER_HUB_NOTIFY_URL
COMPONENT: proxy

include:
- project: 'MISP/helper-containers'
ref: master
file: '/.gitlab-ci-template.yml'
#
# For a cleaner Gitlab CI file include all subfolder which should be build:
#
include:
- '.legacy/.gitlab-ci.yml'
#- '1.0-alpine/.gitlab-ci.yml'
#- '1.1-alpine/.gitlab-ci.yml'
#- '1.2-alpine/.gitlab-ci.yml'
- '1.0-alpine/.gitlab-ci.yml'
- '1.1-alpine/.gitlab-ci.yml'
- '1.2-alpine/.gitlab-ci.yml'
#- '1.3-alpine/.gitlab-ci.yml'
#- '1.4-alpine/.gitlab-ci.yml'
- '1.5-alpine/.gitlab-ci.yml'
#- '1.5-alpine/.gitlab-ci.yml'
- '1.6-alpine/.gitlab-ci.yml'

0 comments on commit 8093b59

Please sign in to comment.