Skip to content

Commit e61c2bc

Browse files
poweradmin job
1 parent ffaac6c commit e61c2bc

19 files changed

+57
-382
lines changed

Dockerfile

+8-16
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,15 @@ RUN set -eux; \
109109
php81 \
110110
php81-fpm \
111111
#php-mcrypt \
112+
php81-intl \
113+
php81-iconv \
112114
php81-mysqlnd \
113115
php81-pdo \
114116
php81-pdo_mysql \
115117
php81-gettext \
116118
php81-openssl \
119+
php81-session \
120+
php81-tokenizer \
117121
musl musl-utils musl-locales tzdata \
118122
; \
119123
true "Setup user and group"; \
@@ -127,42 +131,30 @@ RUN set -eux; \
127131
true "Cleanup"; \
128132
rm -f /var/cache/apk/*
129133

130-
# Copy in built binaries
131134
COPY --from=builder /build/powerdns-root /
132-
133-
# Copy configs
134135
COPY supervisor /etc/supervisor
135136
COPY powerdns /etc/powerdns
136137
COPY entrypoint /usr/bin
137-
138-
#nginx
139138
COPY nginx /etc/nginx
140-
#COPY nginx/vhost.conf /etc/nginx/sites-enabled/vhost.conf
141-
#COPY nginx/fastcgi_params /etc/nginx/fastcgi_params
142-
143-
#php
144139
COPY php81 /etc/php81
145-
#COPY php/php-cli.ini /etc/php/7.0/cli/php.ini
146-
147140

148141
RUN set -eux; \
149-
true "Setup poweradmin"; \
150142
mkdir -p /var/www/html; \
151143
cd /var/www/html; \
152-
rm -rf /var/www/html/*; \
153144
wget https://github.com/poweradmin/poweradmin/archive/refs/tags/v${POWERADMIN_VER}.tar.gz; \
154145
tar -xf v${POWERADMIN_VER}.tar.gz && rm -f v${POWERADMIN_VER}.tar.gz; \
155146
mv poweradmin-${POWERADMIN_VER} poweradmin; \
156-
rm -R /var/www/html/poweradmin/install; \
147+
rm -rf /var/www/html/poweradmin/install/; \
157148
\
158-
true "Flexible Docker Containers"; \
159149
chmod 0750 /etc/powerdns; \
160150
chmod 0640 /etc/powerdns/pdns.conf; \
161151
chown -R root:powerdns /etc/powerdns; \
152+
chown -R nginx:nginx /var/www/html; \
162153
chmod +x /usr/bin/entrypoint; \
163-
\
164154
cp /usr/share/zoneinfo/${TZ} /etc/localtime
165155

156+
COPY poweradmin /var/www/html/poweradmin
157+
166158
EXPOSE 53/TCP 53/UDP 8081/TCP 80/TCP
167159
ENTRYPOINT [ "entrypoint" ]
168160
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]

docker-compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ services:
1313

1414
powerdns:
1515
image: powerdns:latest
16-
volumes:
17-
- ./nginx:/etc/nginx
1816
environment:
1917
- POWERDNS_SERVER_ID=serverid
2018
- POWERDNS_WEBSERVER_ALLOW_FROM=0.0.0.0/0

entrypoint

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,32 @@ fi
77
chown -R powerdns:powerdns /run/powerdns
88
chmod 0755 /run/powerdns
99

10-
1110
#Setup mysql env
1211

1312
if [ -n "$MYSQL_HOST" ]; then
1413
sed -i "s!MYSQL_HOST!${MYSQL_HOST}!" /etc/powerdns/conf.d/gmysql.conf
14+
sed -i "s!{{MYSQL_HOST}}!${MYSQL_HOST}!" /var/www/html/poweradmin/config.inc.php
1515
fi
1616
if [ -n "$MYSQL_PORT" ]; then
1717
sed -i "s!MYSQL_PORT!${MYSQL_PORT}!" /etc/powerdns/conf.d/gmysql.conf
18+
sed -i "s!{{MYSQL_PORT}}!${MYSQL_PORT}!" /var/www/html/poweradmin/config.inc.php
1819
fi
1920
if [ -n "$MYSQL_DATABASE" ]; then
2021
sed -i "s!MYSQL_DATABASE!${MYSQL_DATABASE}!" /etc/powerdns/conf.d/gmysql.conf
22+
sed -i "s!{{MYSQL_DB}}!${MYSQL_DATABASE}!" /var/www/html/poweradmin/config.inc.php
2123
fi
2224
if [ -n "$MYSQL_USER" ]; then
2325
sed -i "s!MYSQL_USER!${MYSQL_USER}!" /etc/powerdns/conf.d/gmysql.conf
26+
sed -i "s!{{MYSQL_USER}}!${MYSQL_USER}!" /var/www/html/poweradmin/config.inc.php
2427
fi
2528
if [ -n "$MYSQL_PASSWORD" ]; then
2629
sed -i "s!MYSQL_PASSWORD!${MYSQL_PASSWORD}!" /etc/powerdns/conf.d/gmysql.conf
30+
sed -i "s!{{MYSQL_PASSWORD}}!${MYSQL_PASSWORD}!" /var/www/html/poweradmin/config.inc.php
2731
fi
2832

33+
SESSION_KEY=`pwgen 32 1`
34+
sed -i "s!{{SESSION_KEY}}!${SESSION_KEY}!" /var/www/html/poweradmin/config.inc.php
35+
2936
# Setup web access
3037
if [ ! -f /etc/powerdns/conf.d/webserver.conf ] && [ -n "$POWERDNS_WEBSERVER_ALLOW_FROM" ]; then
3138
# Check if we got a password

nginx/fastcgi.conf

-26
This file was deleted.

nginx/fastcgi_params

-25
This file was deleted.

nginx/http.d/default.conf

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# This is a default site configuration which will simply return 404, preventing
22
# chance access to any other virtualhost.
3+
upstream php {
4+
server 127.0.0.1:9000;
5+
}
36

47
server {
58
listen 80 default_server;
9+
610
root /var/www/html/;
711
index index.html index.php;
812

@@ -13,8 +17,19 @@ server {
1317
}
1418

1519
location ~ \.php$ {
16-
include fastcgi_params;
17-
fastcgi_pass 127.0.0.1:9000;
20+
include fastcgi_params;
21+
fastcgi_pass php;
22+
fastcgi_index index.php;
23+
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
24+
25+
fastcgi_buffer_size 32k;
26+
fastcgi_buffers 4 32k;
27+
fastcgi_cache_valid 200 60m;
28+
}
29+
30+
location ~ /\. {
31+
deny all;
32+
log_not_found off;
1833
}
1934

2035
location ~* \.(?:jpe?g|gif|png|ico|swf|svg|eot|ttf|otf|woff|htc|css|js)$ {

nginx/mime.types

-99
This file was deleted.

nginx/nginx.conf

-103
This file was deleted.

0 commit comments

Comments
 (0)