Skip to content

Commit 5bdd4cd

Browse files
stamepicmorgstamepicmorg
authored
Merge pull request #65 from EpicMorg/develop
template-generator + new images pack 2
2 parents 014a94e + 500e3e4 commit 5bdd4cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1713
-120
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# Temp make file for local builds and debug
12
Makefile.temp

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
## Changelog
2+
### 2022
3+
* `january`
4+
* fixed `apache2`
5+
* added `php8` support
6+
* extended `testrail` releases with `active directory` and `ldap` auth support.
27
### 2021
8+
* `december`
9+
* added `git-lfs`, `lazygit`, bumped versions of nginx, jira, conflunce and bitbucket.
10+
* added another git addons
11+
* added `gh` - `github-cli` support
312
* `october-november`
413
* added `nginx:quic` image. UNSTABLE.
514
* added `redash:latest` image in to `advanced` pack.

‎Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ ecosystem-images:
166166
cd `pwd`/linux/ecosystem/nginx/latest/main && pwd && make
167167
cd `pwd`/linux/ecosystem/nginx/latest/php && pwd && make
168168
cd `pwd`/linux/ecosystem/nginx/latest/rtmp-hls && pwd && make
169-
cd `pwd`/linux/ecosystem/nginx/latest/quic && pwd && make
170169

171170
cd `pwd`/linux/advanced/vscode-server/latest && pwd && make build && make deploy
172171
cd `pwd`/linux/advanced/vscode-server/devops && pwd && make build && make deploy

‎linux/ecosystem/apache2/latest/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PH
5959
php -m && \
6060
php -v
6161

62+
##################################################################
63+
# Installing timezonedb addon
64+
##################################################################
65+
RUN echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \
66+
php -m && \
67+
php -v
68+
6269
##################################################################
6370
# Installing imagic addon
6471
##################################################################

‎linux/ecosystem/apache2/latest/run.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
#!/bin/bash
2-
chown www-data:www-data /var/www -R
2+
3+
if [[ -z "${FIX_WWW_DATA}" ]]; then
4+
echo "[apache2] env FIX_WWW_DATA is not set. Skipping..."
5+
elif [ "${FIX_WWW_DATA}" == "false" ]; then
6+
echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..."
7+
elif [ "${FIX_WWW_DATA}" == "true" ]; then
8+
echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait."
9+
chown www-data:www-data /var/www -R
10+
echo "[apache2] Done"
11+
else
12+
echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..."
13+
fi
14+
15+
echo "[apache2] Starting up"
316
source /etc/apache2/envvars
417
tail -F /var/log/apache2/* &
518
exec apache2 -D FOREGROUND

‎linux/ecosystem/apache2/php7.2/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PH
5959
php -m && \
6060
php -v
6161

62+
##################################################################
63+
# Installing timezonedb addon
64+
##################################################################
65+
RUN echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \
66+
php -m && \
67+
php -v
68+
6269
##################################################################
6370
# Installing imagic addon
6471
##################################################################

‎linux/ecosystem/apache2/php7.2/run.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
#!/bin/bash
2-
chown www-data:www-data /var/www -R
2+
3+
if [[ -z "${FIX_WWW_DATA}" ]]; then
4+
echo "[apache2] env FIX_WWW_DATA is not set. Skipping..."
5+
elif [ "${FIX_WWW_DATA}" == "false" ]; then
6+
echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..."
7+
elif [ "${FIX_WWW_DATA}" == "true" ]; then
8+
echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait."
9+
chown www-data:www-data /var/www -R
10+
echo "[apache2] Done"
11+
else
12+
echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..."
13+
fi
14+
15+
echo "[apache2] Starting up"
316
source /etc/apache2/envvars
417
tail -F /var/log/apache2/* &
518
exec apache2 -D FOREGROUND

‎linux/ecosystem/apache2/php7.3/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${P
5959
php -m && \
6060
php -v
6161

62+
##################################################################
63+
# Installing timezonedb addon
64+
##################################################################
65+
RUN echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini & \
66+
php -m && \
67+
php -v
68+
6269
##################################################################
6370
# Installing imagic addon
6471
##################################################################

‎linux/ecosystem/apache2/php7.3/run.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
#!/bin/bash
2-
chown www-data:www-data /var/www -R
2+
3+
if [[ -z "${FIX_WWW_DATA}" ]]; then
4+
echo "[apache2] env FIX_WWW_DATA is not set. Skipping..."
5+
elif [ "${FIX_WWW_DATA}" == "false" ]; then
6+
echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..."
7+
elif [ "${FIX_WWW_DATA}" == "true" ]; then
8+
echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait."
9+
chown www-data:www-data /var/www -R
10+
echo "[apache2] Done"
11+
else
12+
echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..."
13+
fi
14+
15+
echo "[apache2] Starting up"
316
source /etc/apache2/envvars
417
tail -F /var/log/apache2/* &
518
exec apache2 -D FOREGROUND

‎linux/ecosystem/apache2/php7.4/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PH
5959
php -m && \
6060
php -v
6161

62+
##################################################################
63+
# Installing timezonedb addon
64+
##################################################################
65+
RUN echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \
66+
php -m && \
67+
php -v
68+
6269
##################################################################
6370
# Installing imagic addon
6471
##################################################################

0 commit comments

Comments
 (0)