summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Volkov <av903u@att.com>2018-10-24 07:40:56 -0700
committerAndrey Volkov <av903u@att.com>2018-10-24 08:35:02 -0700
commitb80214540c0d12caa2286083773647b26f2f67b2 (patch)
tree4140e2482c572966dde7ec379758f328322c26f8
parentb573730642198a31e62274b177029a059d099b86 (diff)
Alternative cmd for nginx only
-rw-r--r--Dockerfile2
-rw-r--r--Vagrantfile3
-rwxr-xr-xassets/run_nginx.sh7
-rwxr-xr-xassets/run_supervisord.sh (renamed from assets/run.sh)0
4 files changed, 10 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index ec8fbf8..c193a99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,4 +81,4 @@ RUN /opt/startup.sh
81 81
82VOLUME [ "/opt/nginx" ] 82VOLUME [ "/opt/nginx" ]
83 83
84CMD [ "/opt/run.sh" ] 84CMD [ "/opt/run_supervisord.sh" ]
diff --git a/Vagrantfile b/Vagrantfile
index bc05447..3ea0140 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -93,7 +93,8 @@ Vagrant.configure("2") do |config|
93 d.build_image "/home/vagrant/docker-aptly -t aptly:test --build-arg PACKAGE_FILE=list" 93 d.build_image "/home/vagrant/docker-aptly -t aptly:test --build-arg PACKAGE_FILE=list"
94 d.run "aptly", 94 d.run "aptly",
95 args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'", 95 args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'",
96 image: "aptly:test" 96 image: "aptly:test",
97 cmd: "/opt/run_nginx.sh"
97 end 98 end
98 99
99 node.vm.provision :shell, inline: <<-SHELL 100 node.vm.provision :shell, inline: <<-SHELL
diff --git a/assets/run_nginx.sh b/assets/run_nginx.sh
new file mode 100755
index 0000000..b632f1a
--- /dev/null
+++ b/assets/run_nginx.sh
@@ -0,0 +1,7 @@
1#!/usr/bin/env bash
2
3set -o pipefail
4set -o errexit
5# set -o xtrace
6
7/usr/sbin/nginx
diff --git a/assets/run.sh b/assets/run_supervisord.sh
index e87c374..e87c374 100755
--- a/assets/run.sh
+++ b/assets/run_supervisord.sh