Skip to content

Commit ec53c73

Browse files
filliphfilliph
committed
Update various things
1 parent 9e43232 commit ec53c73

File tree

13 files changed

+102
-11
lines changed

13 files changed

+102
-11
lines changed

‎mariadb-104/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM mariadb:10.4.8
2+
COPY my.cnf /etc/mysql/conf.d/override.cnf

‎mariadb-104/VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10.4.8

‎mariadb-104/my.cnf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[client]
2+
default-character-set = utf8mb4
3+
4+
[mysqld]
5+
character-set-server = utf8mb4
6+
collation-server = utf8mb4_unicode_ci
7+
join-cache-level = 0
8+
9+
[mysql]
10+
default-character-set = utf8mb4

‎php-apache-70/Dockerfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
FROM php:7.0.33-apache-stretch
22

3-
RUN apt-get update && apt-get install -y ssl-cert && rm -rf /var/lib/apt/lists/*
3+
RUN apt-get update \
4+
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget curl telnet redis-server \
5+
&& rm -rf /var/lib/apt/lists/*
6+
7+
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
8+
&& dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
9+
10+
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
11+
RUN apt-get -y install nodejs
12+
RUN npm install
13+
414

515
RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"
616

‎php-apache-71/Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
FROM php:7.1.32-apache-stretch
1+
FROM php:7.1.33-apache-stretch
22

3-
RUN apt-get update && apt-get install -y ssl-cert && rm -rf /var/lib/apt/lists/*
3+
RUN apt-get update \
4+
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget telnet redis-server \
5+
&& rm -rf /var/lib/apt/lists/*
6+
7+
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
8+
&& dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
9+
10+
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
11+
RUN apt-get -y install nodejs
12+
RUN npm install
413

514
RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"
615

‎php-apache-71/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.32
1+
7.1.33

‎php-apache-72/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
FROM php:7.2.22-apache-stretch
1+
FROM php:7.2.32-apache-stretch
22

3-
RUN apt-get update && apt-get install -y ssl-cert && rm -rf /var/lib/apt/lists/*
3+
RUN apt-get update \
4+
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget telnet redis-server \
5+
&& rm -rf /var/lib/apt/lists/*
6+
7+
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
8+
&& dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
49

510
RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"
611

‎php-apache-72/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.22
1+
7.2.31

‎php-apache-73/Dockerfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
FROM php:7.3.9-apache-stretch
1+
FROM php:7.3.18-apache-stretch
22

3-
RUN apt-get update && apt-get install -y ssl-cert && rm -rf /var/lib/apt/lists/*
3+
RUN apt-get update \
4+
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget telnet redis-server
5+
6+
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
7+
&& dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
8+
9+
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
10+
RUN apt-get -y install nodejs \
11+
&& rm -rf /var/lib/apt/lists/*
12+
RUN npm install
413

514
RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"
615

@@ -25,5 +34,7 @@ RUN usermod -G staff www-data
2534

2635
COPY override.ini /usr/local/etc/php/conf.d/
2736

37+
COPY bash_profile /root/.bash_profile
38+
2839
COPY . /tmp/.
2940
RUN /tmp/build.sh

‎php-apache-73/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.3.9
1+
7.3.18

‎php-apache-73/bash_profile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#+-----------+
2+
#| XenForo 2 |
3+
#+-----------+
4+
5+
alias xf2='php cmd.php $*'
6+
7+
xf2-build() {
8+
php cmd.php xf-addon:sync-json "$1" -v -f
9+
php cmd.php xf-addon:build-release "$1" -v
10+
}
11+
12+
xf2-commit() {
13+
php cmd.php ticktackk-devtools:better-export $1 -stcp
14+
}
15+
16+
xf2-release() {
17+
robo release $1 $2 --repoDir="/Users/Shared/www/public_html/devboards/xf2/src/addons/$1" --changeLogDir="/Users/Shared/www/public_html/devboards/xf2/src/addons/$1/_no_upload" --load-from /Users/filliph
18+
}
19+
20+
xf2-changelog() {
21+
robo change:log $1 $2 --changeLogDir="/Users/Shared/www/public_html/devboards/xf2/src/addons/$1/_no_upload" --load-from /Users/filliph
22+
}
23+
24+
xf2-phpstorm() {
25+
php cmd.php xf-dev:generate-phpstorm-meta
26+
}
27+
28+
xf2-import() {
29+
php cmd.php xf-dev:import --addon=$1
30+
}
31+
32+
xf2-export() {
33+
php cmd.php xf-dev:export --addon=$1
34+
}
35+
36+
xf2-better-export() {
37+
php cmd.php ticktackk-devtools:better-export $1 -st
38+
}
39+
40+
xf2-full() {
41+
php cmd.php ticktackk-devtools:better-export $1 -strcp
42+
}

‎php-apache-73/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
DOCKER_PHP_EXT_INSTALL="bcmath bz2 calendar dba exif gd gettext gmp iconv imap intl mbstring mysqli pdo_dblib pcntl pspell soap sockets xmlrpc xsl zip"
5+
DOCKER_PHP_EXT_INSTALL="bcmath bz2 calendar dba exif gd gettext gmp iconv imap intl mbstring mysqli pdo_mysql pcntl pspell soap sockets xmlrpc xsl zip"
66
DOCKER_PHP_PECL_INSTALL="apcu igbinary memcached redis"
77

88
RUN_PACKAGES=""

‎php-apache-73/override.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ request_order = GP
88
short_open_tag = Off
99
post_max_size = 128M
1010
upload_max_filesize = 128M
11+
extension=pdo_mysql.so

0 commit comments

Comments
 (0)