CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add wait-for.sh to Dockerfile

This commit is contained in:
Elisiário Couto 2019-03-06 18:15:02 +00:00
parent 8e1c638f4e
commit 62a681d657
No known key found for this signature in database
GPG Key ID: F1E9AA2EB0B91BCC
5 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

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

1
Dockerfile
View File

@ -78,6 +78,7 @@ RUN apt-get update \
COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
COPY conf/supervisor/*.conf /etc/supervisor/conf.d/ COPY conf/supervisor/*.conf /etc/supervisor/conf.d/
COPY bin/docker-entrypoint.sh /docker-entrypoint.sh COPY bin/docker-entrypoint.sh /docker-entrypoint.sh
COPY scripts/wait-for.sh /usr/bin/wait-for.sh
EXPOSE 80 443 EXPOSE 80 443

1
docker-compose-dev.yml
View File

@ -21,7 +21,6 @@ services:
volumes: volumes:
- gpg_volume:/var/www/passbolt/config/gpg - gpg_volume:/var/www/passbolt/config/gpg
- images_volume:/var/www/passbolt/webroot/img/public/images - 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"] command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"]
ports: ports:
- 80:80 - 80:80

1
docker-compose-pro.yml
View File

@ -20,7 +20,6 @@ services:
- gpg_volume:/var/www/passbolt/config/gpg - gpg_volume:/var/www/passbolt/config/gpg
- images_volume:/var/www/passbolt/webroot/img/public - images_volume:/var/www/passbolt/webroot/img/public
- ./license:/var/www/passbolt/config/license - ./license:/var/www/passbolt/config/license
- ./scripts/wait-for.sh:/usr/bin/wait-for.sh
tmpfs: tmpfs:
- /run - /run
command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"] command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"]

1
docker-compose.yml
View File

@ -19,7 +19,6 @@ services:
volumes: volumes:
- gpg_volume:/var/www/passbolt/config/gpg - gpg_volume:/var/www/passbolt/config/gpg
- images_volume:/var/www/passbolt/webroot/img/public - images_volume:/var/www/passbolt/webroot/img/public
- ./scripts/wait-for.sh:/usr/bin/wait-for.sh
tmpfs: tmpfs:
- /run - /run
command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"] command: ["/usr/bin/wait-for.sh", "db:3306", "--", "/docker-entrypoint.sh"]