Skip to content

Commit 22ba027

Browse files
committed
fix(ssl): revert to ports 80 and 443 and restore SSL
1 parent 590f87f commit 22ba027

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ FROM php:8.2-apache
44
RUN docker-php-ext-install mysqli && docker-php-ext-enable mysqli
55
RUN apt-get update && apt-get upgrade -y
66

7-
RUN a2enmod rewrite && \
7+
RUN a2enmod ssl && a2enmod rewrite && \
8+
mkdir -p /etc/apache2/ssl && \
89
mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
910

1011
COPY ./WordPress /var/www/html
1112

1213
EXPOSE 80
14+
EXPOSE 443

apache/000-default.conf

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
ServerName local.jquery.com
22

33
<VirtualHost *:80>
4-
ServerName local.jquery.com
4+
ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.jquerymobile.com
5+
DocumentRoot /var/www/html
6+
php_value memory_limit 1024M
7+
<Directory /var/www/html>
8+
Options All
9+
AllowOverride All
10+
Order allow,deny
11+
Allow from all
12+
</Directory>
13+
</VirtualHost>
14+
15+
<VirtualHost *:443>
16+
SSLEngine on
17+
SSLCertificateFile /etc/apache2/ssl/cert.pem
18+
SSLCertificateKeyFile /etc/apache2/ssl/cert-key.pem
19+
520
ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.jquerymobile.com
621
DocumentRoot /var/www/html
722
php_value memory_limit 1024M

docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ services:
1515
- ./jquery-wp-content:/var/www/html/wp-content
1616
- ./uploads:/var/www/html/wp-content/uploads:rw
1717
- ./wp-config.php:/var/www/html/wp-config.php
18+
- ./ssl:/etc/apache2/ssl
1819
- ./apache/.htaccess:/var/www/html/.htaccess
1920
- ./apache/000-default.conf:/etc/apache2/sites-available/000-default.conf
2021
ports:
21-
- "${JQUERY_WP_HTTP_PORT:-9412}:80"
22+
- "80:80"
23+
- "443:443"
2224
networks:
2325
- jquerynet
2426

@@ -31,7 +33,7 @@ services:
3133
volumes:
3234
- jquerydbdata:/var/lib/mysql
3335
ports:
34-
- "${JQUERY_WP_MYSQL_PORT:-9414}:3306"
36+
- "3306:3306"
3537
networks:
3638
- jquerynet
3739

wp-config-sample.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
*/
99

1010
define( 'JQUERY_STAGING', true );
11-
define( 'JQUERY_STAGING_FORMAT', 'local.%s:9412' );
11+
// define( 'JQUERY_STAGING_FORMAT', 'local.%s:9412' );
12+
define( 'JQUERY_STAGING_FORMAT', 'local.%s' );
1213
require_once __DIR__ . '/wp-content/sites.php' ;
1314
define( 'JQUERY_LIVE_SITE', jquery_site_extract( $_SERVER['HTTP_HOST'] ?? 'jquery.com' ) );
1415

0 commit comments

Comments
 (0)