Merge branch 'elisiariocouto-fix/wait-for' into develop

.dockerignore

@@ -8,5 +8,4 @@ Gemfile.lock
 Rakefile
 *.md
 *.yml
-scripts
 env

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
 

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

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"]

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"]

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