From 942131ef53645354b7dabad29ccd8a7b8a9d4d33 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Mon, 13 May 2019 17:13:56 +0200
Subject: [PATCH] Update pica-dokuwiki/docker-compose.yml, .gitlab-ci.yml files
---
.gitlab-ci.yml | 2 +-
pica-dokuwiki/docker-compose.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05fe148b..cd238b81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,7 @@ docker-bench-security:
# if secrets.example files exist, remove the .example extension to be able to start the container
- if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/* ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi;
- cd $MODIFIED_IMAGE
- - docker volume create docker_$CONTAINER_NAME
+ - docker volume create $CONTAINER_NAME
- docker-compose up -d
- git clone https://github.com/docker/docker-bench-security.git
- cd docker-bench-security
diff --git a/pica-dokuwiki/docker-compose.yml b/pica-dokuwiki/docker-compose.yml
index 3f16d9cb..410f9e75 100644
--- a/pica-dokuwiki/docker-compose.yml
+++ b/pica-dokuwiki/docker-compose.yml
@@ -3,7 +3,7 @@ version : "2.4"
volumes:
dokuwiki-app-volume:
external:
- name: "docker_dokuwiki-app"
+ name: "dokuwiki-app"
networks:
docker_default:
--
GitLab