From 62a681d6575cd2a44a5c30c5a3414dff25bfeec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elisi=C3=A1rio=20Couto?= Date: Wed, 6 Mar 2019 18:15:02 +0000 Subject: [PATCH 1/2] add wait-for.sh to Dockerfile --- .dockerignore | 1 - Dockerfile | 1 + docker-compose-dev.yml | 1 - docker-compose-pro.yml | 1 - docker-compose.yml | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index 91fc136..bd44397 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,5 +8,4 @@ Gemfile.lock Rakefile *.md *.yml -scripts env diff --git a/Dockerfile b/Dockerfile index f447add..61d4d11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,6 +78,7 @@ RUN apt-get update \ COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf COPY conf/supervisor/*.conf /etc/supervisor/conf.d/ COPY bin/docker-entrypoint.sh /docker-entrypoint.sh +COPY scripts/wait-for.sh /usr/bin/wait-for.sh EXPOSE 80 443 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 0ff4ac0..d0818de 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -21,7 +21,6 @@ services: volumes: - gpg_volume:/var/www/passbolt/config/gpg - images_volume:/var/www/passbolt/webroot/img/public/images - - ./scripts/wait-for.sh:/usr/bin/wait-for.sh command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"] ports: - 80:80 diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml index d3077ff..09c8ff8 100644 --- a/docker-compose-pro.yml +++ b/docker-compose-pro.yml @@ -20,7 +20,6 @@ services: - gpg_volume:/var/www/passbolt/config/gpg - images_volume:/var/www/passbolt/webroot/img/public - ./license:/var/www/passbolt/config/license - - ./scripts/wait-for.sh:/usr/bin/wait-for.sh tmpfs: - /run command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index a225b86..0cb2e1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,6 @@ services: volumes: - gpg_volume:/var/www/passbolt/config/gpg - images_volume:/var/www/passbolt/webroot/img/public - - ./scripts/wait-for.sh:/usr/bin/wait-for.sh tmpfs: - /run command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"] From 69cfe6cdfd38e3a7b28f7e033a6b84e2c409100f Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Fri, 29 Mar 2019 11:27:19 +0100 Subject: [PATCH 2/2] check wait-for is on the image --- spec/docker_image/image_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/docker_image/image_spec.rb b/spec/docker_image/image_spec.rb index 2152e53..1620270 100644 --- a/spec/docker_image/image_spec.rb +++ b/spec/docker_image/image_spec.rb @@ -34,6 +34,7 @@ describe 'Dockerfile' do 'curl', 'gd', 'intl', 'json', 'mcrypt', 'mysqlnd', 'xsl', 'phar', 'posix', 'xml', 'zlib', 'ctype', 'pdo', 'gnupg', 'pdo_mysql' ] } + let(:wait_for) { '/usr/bin/wait-for.sh' } describe 'passbolt required php extensions' do it 'has php extensions installed' do @@ -61,6 +62,12 @@ describe 'Dockerfile' do end end + describe 'wait-for' do + it 'is installed' do + expect(file(wait_for)).to exist and be_executable + end + end + describe 'passbolt directory structure' do it 'must exist and be directories' do expect(file(passbolt_home)).to be_a_directory