Skip to content

Commit 3d22258

Browse files
authored
Merge pull request #333 from sil-org/https
Release 8.1.0 -- add option to serve https
2 parents a150090 + 723399f commit 3d22258

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM silintl/php8:8.3
33
ARG GITHUB_REF_NAME
44
ENV GITHUB_REF_NAME=$GITHUB_REF_NAME
55

6-
RUN apt-get update -y && \
6+
RUN apt-get update && \
7+
apt-get --no-install-recommends install -y ssl-cert && \
78
apt-get clean && \
8-
rm -rf /var/lib/apt/lists/*
9+
rm -rf /var/lib/apt/lists/* && \
10+
make-ssl-cert generate-default-snakeoil && \
11+
a2enmod ssl
912

1013
WORKDIR /data
1114

compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ services:
3333
image: phpmyadmin:5
3434
ports:
3535
- "51151:80"
36+
- "51151:443"
3637
environment:
3738
PMA_HOST: db
3839
PMA_USER: idpmgmt

dockerbuild/vhost.conf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,26 @@
1212
LogLevel info
1313
SetEnvIf Request_URI "^/site/system-status$" dontlog
1414
CustomLog /proc/self/fd/1 combined env=!dontlog
15+
</VirtualHost>
16+
17+
<VirtualHost _default_:443>
18+
ServerName localhost
19+
DocumentRoot /data/frontend/web/
20+
RewriteEngine On
21+
DirectoryIndex index.php
22+
SSLEngine on
23+
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
24+
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
25+
26+
<Directory /data/frontend/web/>
27+
Options FollowSymLinks
28+
AllowOverride All
29+
Require all granted
30+
</Directory>
1531

32+
LogLevel info
33+
SetEnvIf Request_URI "^/site/system-status$" dontlog
34+
CustomLog /proc/self/fd/1 combined env=!dontlog
1635
</VirtualHost>
1736

1837
<FilesMatch \.php$>

0 commit comments

Comments
 (0)