Skip to content

Commit 1fc7b2a

Browse files
filliphfilliph
committed
Various changes
1 parent 6c64526 commit 1fc7b2a

File tree

20 files changed

+337
-53
lines changed

20 files changed

+337
-53
lines changed

‎mariadb-105/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM mariadb:10.5.3
1+
FROM mariadb:10.5.4
22
COPY my.cnf /etc/mysql/conf.d/override.cnf

‎mariadb-105/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.3
1+
10.5.4

‎php-apache-53/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,11 @@ RUN usermod -G staff www-data
1717

1818
COPY override.ini /usr/local/etc/php/conf.d/
1919

20+
COPY bash_profile /root/.bash_profile
21+
2022
COPY . /tmp/.
21-
RUN /tmp/build.sh
23+
RUN /tmp/build.sh
24+
25+
RUN wget http://robo.li/robo.phar \
26+
&& chmod +x robo.phar \
27+
&& mv robo.phar /usr/local/bin/robo

‎php-apache-53/bash_profile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-release() {
13+
robo release $1 $2 --repoDir="$PWD/src/addons/$1" --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
14+
}
15+
16+
xf2-changelog() {
17+
robo change:log $1 $2 --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
18+
}
19+
20+
xf2-phpstorm() {
21+
php cmd.php xf-dev:generate-phpstorm-meta
22+
}
23+
24+
xf2-import() {
25+
php cmd.php xf-dev:import --addon=$1
26+
}
27+
28+
xf2-export() {
29+
php cmd.php xf-dev:export --addon=$1
30+
}
31+
32+
xf2-better-export() {
33+
php cmd.php tck-devtools:better-export $1 --skip-export
34+
php cmd.php tck-devtools:build-readme $1 --markdown --copy
35+
}

‎php-apache-54/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@ ENV APACHE_LOG_DIR logs
1616

1717
COPY override.ini /usr/local/etc/php/conf.d/
1818

19+
COPY bash_profile /root/.bash_profile
20+
1921
COPY . /tmp/.
20-
RUN /tmp/build.sh
22+
RUN /tmp/build.sh
23+
24+
RUN wget http://robo.li/robo.phar \
25+
&& chmod +x robo.phar \
26+
&& mv robo.phar /usr/local/bin/robo

‎php-apache-54/bash_profile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-release() {
13+
robo release $1 $2 --repoDir="$PWD/src/addons/$1" --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
14+
}
15+
16+
xf2-changelog() {
17+
robo change:log $1 $2 --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
18+
}
19+
20+
xf2-phpstorm() {
21+
php cmd.php xf-dev:generate-phpstorm-meta
22+
}
23+
24+
xf2-import() {
25+
php cmd.php xf-dev:import --addon=$1
26+
}
27+
28+
xf2-export() {
29+
php cmd.php xf-dev:export --addon=$1
30+
}
31+
32+
xf2-better-export() {
33+
php cmd.php tck-devtools:better-export $1 --skip-export
34+
php cmd.php tck-devtools:build-readme $1 --markdown --copy
35+
}

‎php-apache-55/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,11 @@ RUN usermod -G staff www-data
1717

1818
COPY override.ini /usr/local/etc/php/conf.d/
1919

20+
COPY bash_profile /root/.bash_profile
21+
2022
COPY . /tmp/.
21-
RUN /tmp/build.sh
23+
RUN /tmp/build.sh
24+
25+
RUN wget http://robo.li/robo.phar \
26+
&& chmod +x robo.phar \
27+
&& mv robo.phar /usr/local/bin/robo

‎php-apache-55/bash_profile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-release() {
13+
robo release $1 $2 --repoDir="$PWD/src/addons/$1" --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
14+
}
15+
16+
xf2-changelog() {
17+
robo change:log $1 $2 --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
18+
}
19+
20+
xf2-phpstorm() {
21+
php cmd.php xf-dev:generate-phpstorm-meta
22+
}
23+
24+
xf2-import() {
25+
php cmd.php xf-dev:import --addon=$1
26+
}
27+
28+
xf2-export() {
29+
php cmd.php xf-dev:export --addon=$1
30+
}
31+
32+
xf2-better-export() {
33+
php cmd.php tck-devtools:better-export $1 --skip-export
34+
php cmd.php tck-devtools:build-readme $1 --markdown --copy
35+
}

‎php-apache-56/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,11 @@ RUN usermod -G staff www-data
2525

2626
COPY override.ini /usr/local/etc/php/conf.d/
2727

28+
COPY bash_profile /root/.bash_profile
29+
2830
COPY . /tmp/.
29-
RUN /tmp/build.sh
31+
RUN /tmp/build.sh
32+
33+
RUN wget http://robo.li/robo.phar \
34+
&& chmod +x robo.phar \
35+
&& mv robo.phar /usr/local/bin/robo

‎php-apache-56/bash_profile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-release() {
13+
robo release $1 $2 --repoDir="$PWD/src/addons/$1" --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
14+
}
15+
16+
xf2-changelog() {
17+
robo change:log $1 $2 --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
18+
}
19+
20+
xf2-phpstorm() {
21+
php cmd.php xf-dev:generate-phpstorm-meta
22+
}
23+
24+
xf2-import() {
25+
php cmd.php xf-dev:import --addon=$1
26+
}
27+
28+
xf2-export() {
29+
php cmd.php xf-dev:export --addon=$1
30+
}
31+
32+
xf2-better-export() {
33+
php cmd.php tck-devtools:better-export $1 --skip-export
34+
php cmd.php tck-devtools:build-readme $1 --markdown --copy
35+
}

‎php-apache-70/Dockerfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ FROM php:7.0.33-apache-stretch
33
RUN mkdir -p /usr/share/man/man1
44

55
RUN apt-get update \
6-
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget curl telnet redis-server default-jre \
7-
&& rm -rf /var/lib/apt/lists/*
6+
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget curl telnet redis-server default-jre
87

98
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
109
&& dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
1110

1211
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
13-
RUN apt-get -y install nodejs
12+
RUN apt-get -y install nodejs \
13+
&& rm -rf /var/lib/apt/lists/*
1414
RUN npm install
1515

16-
1716
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"
1817

1918
RUN a2enmod rewrite
@@ -24,10 +23,10 @@ ARG DOCKER_PHP_EXT_INSTALL
2423
ARG DOCKER_PHP_PECL_INSTALL
2524

2625
# https://hub.docker.com/_/composer/
27-
COPY --from=composer:1.6.5 /usr/bin/composer /usr/bin/composer
26+
COPY --from=composer:1.10.8 /usr/bin/composer /usr/bin/composer
2827
ENV COMPOSER_ALLOW_SUPERUSER 1
2928
ENV COMPOSER_HOME /tmp
30-
ENV COMPOSER_VERSION 1.6.5
29+
ENV COMPOSER_VERSION 1.10.8
3130

3231
# https://github.com/wimg/PHPCompatibility/releases
3332
ENV PHP_COMPATIBILITY_VERSION 8.1.0
@@ -37,5 +36,11 @@ RUN usermod -G staff www-data
3736

3837
COPY override.ini /usr/local/etc/php/conf.d/
3938

39+
COPY bash_profile /root/.bash_profile
40+
4041
COPY . /tmp/.
41-
RUN /tmp/build.sh
42+
RUN /tmp/build.sh
43+
44+
RUN wget http://robo.li/robo.phar \
45+
&& chmod +x robo.phar \
46+
&& mv robo.phar /usr/local/bin/robo

‎php-apache-70/bash_profile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-release() {
13+
robo release $1 $2 --repoDir="$PWD/src/addons/$1" --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
14+
}
15+
16+
xf2-changelog() {
17+
robo change:log $1 $2 --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
18+
}
19+
20+
xf2-phpstorm() {
21+
php cmd.php xf-dev:generate-phpstorm-meta
22+
}
23+
24+
xf2-import() {
25+
php cmd.php xf-dev:import --addon=$1
26+
}
27+
28+
xf2-export() {
29+
php cmd.php xf-dev:export --addon=$1
30+
}
31+
32+
xf2-better-export() {
33+
php cmd.php tck-devtools:better-export $1 --skip-export
34+
php cmd.php tck-devtools:build-readme $1 --markdown --copy
35+
}

‎php-apache-71/Dockerfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ FROM php:7.1.33-apache-stretch
33
RUN mkdir -p /usr/share/man/man1
44

55
RUN apt-get update \
6-
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget telnet redis-server default-jre \
7-
&& rm -rf /var/lib/apt/lists/*
6+
&& apt-get install -y ssl-cert xfonts-utils fontconfig libxrender1 xfonts-75dpi xfonts-base libjpeg62-turbo libxext6 wget telnet redis-server default-jre
87

98
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
109
&& dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
1110

1211
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
13-
RUN apt-get -y install nodejs
12+
RUN apt-get -y install nodejs \
13+
&& rm -rf /var/lib/apt/lists/*
1414
RUN npm install
1515

1616
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"
@@ -23,10 +23,10 @@ ARG DOCKER_PHP_EXT_INSTALL
2323
ARG DOCKER_PHP_PECL_INSTALL
2424

2525
# https://hub.docker.com/_/composer/
26-
COPY --from=composer:1.6.5 /usr/bin/composer /usr/bin/composer
26+
COPY --from=composer:1.10.8 /usr/bin/composer /usr/bin/composer
2727
ENV COMPOSER_ALLOW_SUPERUSER 1
2828
ENV COMPOSER_HOME /tmp
29-
ENV COMPOSER_VERSION 1.6.5
29+
ENV COMPOSER_VERSION 1.10.8
3030

3131
# https://github.com/wimg/PHPCompatibility/releases
3232
ENV PHP_COMPATIBILITY_VERSION 8.1.0
@@ -36,5 +36,11 @@ RUN usermod -G staff www-data
3636

3737
COPY override.ini /usr/local/etc/php/conf.d/
3838

39+
COPY bash_profile /root/.bash_profile
40+
3941
COPY . /tmp/.
40-
RUN /tmp/build.sh
42+
RUN /tmp/build.sh
43+
44+
RUN wget http://robo.li/robo.phar \
45+
&& chmod +x robo.phar \
46+
&& mv robo.phar /usr/local/bin/robo

‎php-apache-71/bash_profile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-release() {
13+
robo release $1 $2 --repoDir="$PWD/src/addons/$1" --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
14+
}
15+
16+
xf2-changelog() {
17+
robo change:log $1 $2 --changeLogDir="$PWD/src/addons/$1/_no_upload" --load-from /var/www/html/robo
18+
}
19+
20+
xf2-phpstorm() {
21+
php cmd.php xf-dev:generate-phpstorm-meta
22+
}
23+
24+
xf2-import() {
25+
php cmd.php xf-dev:import --addon=$1
26+
}
27+
28+
xf2-export() {
29+
php cmd.php xf-dev:export --addon=$1
30+
}
31+
32+
xf2-better-export() {
33+
php cmd.php tck-devtools:better-export $1 --skip-export
34+
php cmd.php tck-devtools:build-readme $1 --markdown --copy
35+
}

0 commit comments

Comments
 (0)