diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fdb5d75..a0bfd34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,7 @@ jobs: - "sqlite" - "mariadb" - "postgresql" + - "postgresql-secret" steps: - name: "Checkout" diff --git a/tests/credentials/db_password b/tests/credentials/db_password new file mode 100644 index 0000000..bfe4329 --- /dev/null +++ b/tests/credentials/db_password @@ -0,0 +1 @@ +wallapass diff --git a/tests/credentials/env_secret b/tests/credentials/env_secret new file mode 100644 index 0000000..7440e0b --- /dev/null +++ b/tests/credentials/env_secret @@ -0,0 +1 @@ +F00B4R diff --git a/tests/credentials/postgres_password b/tests/credentials/postgres_password new file mode 100644 index 0000000..aa3c1b0 --- /dev/null +++ b/tests/credentials/postgres_password @@ -0,0 +1 @@ +my-secret-pw diff --git a/tests/docker-compose.postgresql-secret.yml b/tests/docker-compose.postgresql-secret.yml new file mode 100644 index 0000000..a76357c --- /dev/null +++ b/tests/docker-compose.postgresql-secret.yml @@ -0,0 +1,31 @@ +version: '2' +services: + wallabag: + build: + context: ../ + image: wallabag:postgresql + container_name: wallabag + environment: + - POSTGRES_PASSWORD__FILE=/run/secrets/postgres_password + - POSTGRES_USER=my-super-user + - SYMFONY__ENV__SECRET__FILE=/run/secrets/env_secret + - SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql + - SYMFONY__ENV__DATABASE_HOST=db + - SYMFONY__ENV__DATABASE_PORT=5432 + - SYMFONY__ENV__DATABASE_NAME=wallabag + - SYMFONY__ENV__DATABASE_USER=wallabag + - SYMFONY__ENV__DATABASE_PASSWORD__FILE=/run/secrets/db_password + ports: + - "127.0.0.1:80:80" + # Docker Secrets require Swarm Mode, so we use volumes instead to spoof the behaviour + volumes: + - ./tests/credentials/db_password:/run/secrets/db_password + - ./tests/credentials/postgres_password:/run/secrets/postgres_password + - ./tests/credentials/env_secret:/run/secrets/env_secret + db: + image: postgres:10.3 + environment: + - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password + - POSTGRES_USER=my-super-user + volumes: + - ./tests/credentials/postgres_password:/run/secrets/postgres_password