diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba0b52f9345a6053a4a626b5f6c1007b2ed8d003..38e8b6bf156d96f7bd82f2861ced254b6750abc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ metabuild: refs: - master - dev-ci + when: manual # build the container that was modified build: @@ -92,7 +93,7 @@ docker-bench-security: # remove links to external networks to be able to start the container locally - sed -i -e '/networks/,+3d' $MODIFIED_IMAGE/docker-compose.yml # 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/*.test ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi; + - if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.example ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi; - docker volume create $CONTAINER_NAME script: - cd $MODIFIED_IMAGE diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_ADMIN_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_ADMIN_PASSWORD new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_PASSWORD new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/MYSQL_PORT_3306_TCP_ADDR b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/MYSQL_PORT_3306_TCP_ADDR new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_DATABASE b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_DATABASE new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_PASSWORD new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_USER b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_USER new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pica-etherpad/secrets/etherpad-app.secrets.production b/pica-etherpad/secrets/etherpad-app.secrets.production deleted file mode 100644 index 6785737bb78205af0b95bd34db917bcb712ea336..0000000000000000000000000000000000000000 --- a/pica-etherpad/secrets/etherpad-app.secrets.production +++ /dev/null @@ -1,5 +0,0 @@ -ETHERPAD_ADMIN_PASSWORD=password -ETHERPAD_DB_NAME=db_name -ETHERPAD_DB_USER=user -ETHERPAD_DB_PASSWORD=password -MYSQL_PORT_3306_TCP_ADDR=mysql \ No newline at end of file diff --git a/pica-etherpad/secrets/etherpad-app.secrets.test b/pica-etherpad/secrets/etherpad-app.secrets.test deleted file mode 100644 index 6785737bb78205af0b95bd34db917bcb712ea336..0000000000000000000000000000000000000000 --- a/pica-etherpad/secrets/etherpad-app.secrets.test +++ /dev/null @@ -1,5 +0,0 @@ -ETHERPAD_ADMIN_PASSWORD=password -ETHERPAD_DB_NAME=db_name -ETHERPAD_DB_USER=user -ETHERPAD_DB_PASSWORD=password -MYSQL_PORT_3306_TCP_ADDR=mysql \ No newline at end of file diff --git a/pica-etherpad/secrets/etherpad-db.secrets.production b/pica-etherpad/secrets/etherpad-db.secrets.example similarity index 100% rename from pica-etherpad/secrets/etherpad-db.secrets.production rename to pica-etherpad/secrets/etherpad-db.secrets.example diff --git a/pica-etherpad/secrets/etherpad-db.secrets.test b/pica-etherpad/secrets/etherpad-db.secrets.test deleted file mode 100644 index a95ba3b8b9cbfca123557b9f8d8473cef2b3a193..0000000000000000000000000000000000000000 --- a/pica-etherpad/secrets/etherpad-db.secrets.test +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_ROOT_PASSWORD=password -MYSQL_USER=user -MYSQL_PASSWORD=password -MYSQL_DATABASE=database \ No newline at end of file