Skip to content

Commit d2d2fa8

Browse files
mblaschkemblaschke
committed
Fix environment settings
- Introduce environment.base and environment.baseApp
1 parent 0a41855 commit d2d2fa8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+74
-64
lines changed

‎docker/base-app/alpine-3/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/alpine-3/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/centos-7/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/centos-7/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/debian-7/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/debian-7/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/debian-8/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/debian-8/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/debian-9/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/debian-9/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/ubuntu-12.04/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/ubuntu-12.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/ubuntu-14.04/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/ubuntu-14.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/ubuntu-15.04/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/ubuntu-15.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/ubuntu-15.10/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/ubuntu-15.10/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/ubuntu-16.04/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/ubuntu-16.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base-app/ubuntu-16.10/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application
1515
ENV APPLICATION_PATH /app
1616
ENV APPLICATION_UID 1000
1717
ENV APPLICATION_GID 1000
18-
ENV LOG_STDOUT ""
19-
ENV LOG_STDERR ""
2018

2119
COPY conf/ /opt/docker/
2220

‎docker/base-app/ubuntu-16.10/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.app() }}
5+
{{ environment.baseApp() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/alpine-3/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/alpine-3/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/centos-7/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/centos-7/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/debian-7/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/debian-7/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/debian-8/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/debian-8/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/debian-9/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/debian-9/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/ubuntu-12.04/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/ubuntu-12.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/ubuntu-14.04/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/ubuntu-14.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/ubuntu-15.04/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/ubuntu-15.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/ubuntu-15.10/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/ubuntu-15.10/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/ubuntu-16.04/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/ubuntu-16.04/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

‎docker/base/ubuntu-16.10/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8
1111
LABEL io.webdevops.version=1.5.0
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
14+
ENV LOG_STDOUT ""
15+
ENV LOG_STDERR ""
1416

1517
COPY conf/ /opt/docker/
1618

‎docker/base/ubuntu-16.10/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{ docker.version() }}
44

5-
{{ environment.homePath() }}
5+
{{ environment.base() }}
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

0 commit comments

Comments
 (0)