Skip to content

Commit 30ebd33

Browse files
committed
Fix Dockerfile templates: add helpers.php
1 parent 7b63c0d commit 30ebd33

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

Dockerfile-alpine.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ RUN set -ex; \
123123

124124
# Copy configuration
125125
COPY config.inc.php /etc/phpmyadmin/config.inc.php
126+
COPY helpers.php /etc/phpmyadmin/helpers.php
126127
RUN chown www-data:www-data -R /etc/phpmyadmin/
127128

128129
# Copy main script

Dockerfile-debian.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ RUN set -ex; \
143143

144144
# Copy configuration
145145
COPY config.inc.php /etc/phpmyadmin/config.inc.php
146+
COPY helpers.php /etc/phpmyadmin/helpers.php
146147
RUN chown www-data:www-data -R /etc/phpmyadmin/
147148

148149
# Copy main script

fpm-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ RUN set -ex; \
124124

125125
# Copy configuration
126126
COPY config.inc.php /etc/phpmyadmin/config.inc.php
127+
COPY helpers.php /etc/phpmyadmin/helpers.php
127128
RUN chown www-data:www-data -R /etc/phpmyadmin/
128129

129130
# Copy main script

fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ RUN set -ex; \
3838
| sort -u \
3939
| xargs -rt apt-mark manual; \
4040
\
41+
# start: Apache specific build
42+
a2enmod remoteip; \
43+
# end: Apache specific build
4144
\
4245
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
4346
rm -rf /var/lib/apt/lists/*; \
@@ -141,6 +144,7 @@ RUN set -ex; \
141144

142145
# Copy configuration
143146
COPY config.inc.php /etc/phpmyadmin/config.inc.php
147+
COPY helpers.php /etc/phpmyadmin/helpers.php
144148
RUN chown www-data:www-data -R /etc/phpmyadmin/
145149

146150
# Copy main script

0 commit comments

Comments
 (0)