airship/utils
Code Issues Proposed changes

Alternative cmd for nginx only

Browse Source
This commit is contained in:
Andrey Volkov 2018-10-24 07:40:56 -07:00
parent b573730642
commit b80214540c
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -81,4 +81,4 @@ RUN /opt/startup.sh
VOLUME [ "/opt/nginx" ] VOLUME [ "/opt/nginx" ]
CMD [ "/opt/run.sh" ] CMD [ "/opt/run_supervisord.sh" ]

3
Vagrantfile vendored
View File

@ -93,7 +93,8 @@ Vagrant.configure("2") do |config|
d.build_image "/home/vagrant/docker-aptly -t aptly:test --build-arg PACKAGE_FILE=list" d.build_image "/home/vagrant/docker-aptly -t aptly:test --build-arg PACKAGE_FILE=list"
d.run "aptly", d.run "aptly",
args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'", args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'",
image: "aptly:test" image: "aptly:test",
cmd: "/opt/run_nginx.sh"
end end
node.vm.provision :shell, inline: <<-SHELL node.vm.provision :shell, inline: <<-SHELL

7
assets/run_nginx.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
set -o errexit
# set -o xtrace
/usr/sbin/nginx

0
assets/run.sh → assets/run_supervisord.sh
View File