Skip to content

Commit

Permalink
Bug/MDD-187: Changelog for Release Candidate 1.0.4 (#58)
Browse files Browse the repository at this point in the history
## Bug/MDD-187: Changelog for Release Candidate 1.0.4
This MISP-dockerized release is a minor release.

### Update Information
This release includes new CI files and we fixed a bug which prevents the CI to push the MISP-dockerized environment to the Docker registries.

### General Changes
No general changes where made.

### Detailed Information
- We fixed the .ci/30_push_2_registry.sh script
  • Loading branch information
8ear authored Feb 22, 2019
1 parent 8b8f76e commit 0ccd038
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
13 changes: 9 additions & 4 deletions .ci/30_push_2_registry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func_tag() {
do
k="$(echo "$i"|sed 's,-dev$,,')"
echo "$STARTMSG Retag: $DOCKER_REPO:$i with $DOCKER_REPO:$k"
docker tag "$DOCKER_REPO:$i" "$DOCKER_REPO:$k;"
docker tag "$DOCKER_REPO:$i" "$DOCKER_REPO:$k"
echo "$STARTMSG Remove: $DOCKER_REPO:$i"
docker image rm "$DOCKER_REPO:$i"
done
Expand Down Expand Up @@ -55,8 +55,8 @@ SERVER_TAG="$(docker ps -f name=server --format '{{.Image}}'|cut -d : -f 2)"
PROXY_TAG="$(docker ps -f name=proxy --format '{{.Image}}'|cut -d : -f 2)"
ROBOT_TAG="$(docker ps -f name=robot --format '{{.Image}}'|cut -d : -f 2)"
MODULES_TAG="$(docker ps -f name=modules --format '{{.Image}}'|cut -d : -f 2)"
#DB_TAG=$(docker ps -f name=db --format '{{.Image}}'|cut -d : -f 2)
#REDIS_TAG=$(docker ps -f name=redis --format '{{.Image}}'|cut -d : -f 2)
DB_TAG=$(docker ps -f name=db --format '{{.Image}}'|cut -d : -f 2)
REDIS_TAG=$(docker ps -f name=redis --format '{{.Image}}'|cut -d : -f 2)


# Login to Docker registry
Expand All @@ -69,16 +69,21 @@ if [ ! -z "$DOCKER_LOGIN_STATE" ]; then
# retag all existing tags dev 2 public repo
#$makefile_travis tag REPOURL=$REGISTRY_URL server_tag=${server_tag} proxy_tag=${proxy_tag} robot_tag=${robot_tag} modules_tag=${modules_tag} db_tag=${modules_tag} redis_tag=${modules_tag} postfix_tag=${postfix_tag}
func_tag "$REGISTRY_URL/misp-dockerized-server" "$SERVER_TAG"
func_tag "$REGISTRY_URL/misp-dockerized-server" "$SERVER_TAG"
func_tag "$REGISTRY_URL/misp-dockerized-proxy" "$PROXY_TAG"
func_tag "$REGISTRY_URL/misp-dockerized-robot" "$ROBOT_TAG"
func_tag "$REGISTRY_URL/misp-dockerized-misp-modules" "$MODULES_TAG"
#func_tag "$REGISTRY_URL/misp-dockerized-db" "$DB_TAG"
#func_tag "$REGISTRY_URL/misp-dockerized-redis" "$REDIS_TAG"
echo "###########################################" && docker images && echo "###########################################"
# Push all Docker images
#$makefile_travis push REPOURL=$REGISTRY_URL server_tag=${server_tag} proxy_tag=${proxy_tag} robot_tag=${robot_tag} modules_tag=${modules_tag} postfix_tag=${postfix_tag}
func_push "$REGISTRY_URL/misp-dockerized-server" "$SERVER_TAG"
func_push "$REGISTRY_URL/misp-dockerized-proxy" "$PROXY_TAG"
func_push "$REGISTRY_URL/misp-dockerized-robot" "$ROBOT_TAG"
func_push "$REGISTRY_URL/misp-dockerized-misp-modules" "$MODULES_TAG"
#func_push "$REGISTRY_URL/misp-dockerized-db" "$DB_TAG"
#func_push "$REGISTRY_URL/misp-dockerized-redis" "$REDIS_TAG"

else
echo "$DOCKER_LOGIN_OUTPUT"
exit
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,5 @@ include:
#- '0.3.4/.gitlab-ci.yml'
#- '1.0.0/.gitlab-ci.yml'
#- '1.0.1/.gitlab-ci.yml'
- '1.0.2/.gitlab-ci.yml'
#- '1.0.2/.gitlab-ci.yml'
- '1.0.3/.gitlab-ci.yml'
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
#- VERSION=0.3.4
#- VERSION=1.0.0
#- VERSION=1.0.1
- VERSION=1.0.2
#- VERSION=1.0.2
- VERSION=1.0.3

before_install:
Expand Down

0 comments on commit 0ccd038

Please sign in to comment.