Skip to content

Commit 440bce6

Browse files
committed
simplify as we only have nginx now
1 parent 73eeb30 commit 440bce6

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

fwd-template.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"name": "7.4-nginx",
66
"data": {
77
"from": "kooldev/php:7.4-nginx",
8-
"nginx": true,
98
"prod": false,
109
"version": "7.4"
1110
},
@@ -24,7 +23,6 @@
2423
"name": "7.4-nginx-prod",
2524
"data": {
2625
"from": "kooldev/php:7.4-nginx-prod",
27-
"nginx": true,
2826
"prod": true,
2927
"version": "7.4"
3028
},
@@ -43,7 +41,6 @@
4341
"name": "8.0-nginx",
4442
"data": {
4543
"from": "kooldev/php:8.0-nginx",
46-
"nginx": true,
4744
"prod": false,
4845
"version": "8.0"
4946
},
@@ -62,7 +59,6 @@
6259
"name": "8.0-nginx-prod",
6360
"data": {
6461
"from": "kooldev/php:8.0-nginx-prod",
65-
"nginx": true,
6662
"prod": true,
6763
"version": "8.0"
6864
},
@@ -81,7 +77,6 @@
8177
"name": "8.1-nginx",
8278
"data": {
8379
"from": "kooldev/php:8.1-nginx",
84-
"nginx": true,
8580
"prod": false,
8681
"version": "8.1"
8782
},
@@ -100,7 +95,6 @@
10095
"name": "8.1-nginx-prod",
10196
"data": {
10297
"from": "kooldev/php:8.1-nginx-prod",
103-
"nginx": true,
10498
"prod": true,
10599
"version": "8.1"
106100
},
@@ -119,7 +113,6 @@
119113
"name": "8.2-nginx",
120114
"data": {
121115
"from": "kooldev/php:8.2-nginx",
122-
"nginx": true,
123116
"prod": false,
124117
"version": "8.2"
125118
},
@@ -138,7 +131,6 @@
138131
"name": "8.2-nginx-prod",
139132
"data": {
140133
"from": "kooldev/php:8.2-nginx-prod",
141-
"nginx": true,
142134
"prod": true,
143135
"version": "8.2"
144136
},
@@ -157,7 +149,6 @@
157149
"name": "8.3-nginx",
158150
"data": {
159151
"from": "kooldev/php:8.3-nginx",
160-
"nginx": true,
161152
"prod": false,
162153
"version": "8.3"
163154
},
@@ -176,7 +167,6 @@
176167
"name": "8.3-nginx-prod",
177168
"data": {
178169
"from": "kooldev/php:8.3-nginx-prod",
179-
"nginx": true,
180170
"prod": true,
181171
"version": "8.3"
182172
},

template/Dockerfile.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
FROM wordpress:php{{ $version }}-fpm-alpine as wordpress
33
FROM {{ $from }}
44

5-
@if ($nginx)
65
ENV NGINX_ROOT=/app
7-
@endif
86

97
COPY --from=wordpress-cli /usr/local/bin/wp /usr/local/bin/wp
108
COPY --from=wordpress --chown=kool:kool /usr/src/wordpress /kool/wordpress

template/entrypoint.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
22
set -eo pipefail
33

4-
@if ($nginx)
54
# Nginx server config
65
dockerize -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
7-
@endif
86

97
# Run as current user
108
CURRENT_USER=${ASUSER:-${UID:-0}}

0 commit comments

Comments
 (0)