Skip to content

Feature/env virtual host #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 8, 2016
Merged

Feature/env virtual host #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
693997d
Add VIRTUAL_HOST as dnsmasq lookup
mblaschke Jul 20, 2016
51091d5
Enable dnsmasq by default for base-app
mblaschke Jul 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down
7 changes: 6 additions & 1 deletion provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## clear dns file
echo > /etc/dnsmasq.d/development
echo > /etc/dnsmasq.d/webdevops

if [ ! -f /etc/resolv.conf.original ]; then
cp -a /etc/resolv.conf /etc/resolv.conf.original
Expand All @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
## set dnsmasq to main nameserver
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi

# Add own VIRTUAL_HOST as loopback
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
fi
2 changes: 1 addition & 1 deletion provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ priority=15
command = /opt/docker/bin/service.d/dnsmasq.sh
process_name=%(program_name)s
startsecs = 0
autostart = false
autostart = true
autorestart = true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
Expand Down