Merge pull request #1 from bitnami/remove_debian_8

Removed Debian 8 from root version folders
This commit is contained in:
Juan José Martos 2018-10-01 12:56:36 +02:00 committed by GitHub
commit 7f0966faf4
18 changed files with 0 additions and 406 deletions

View File

@ -1,51 +0,0 @@
FROM bitnami/minideb-extras:jessie-r107
LABEL maintainer "Bitnami <containers@bitnami.com>"
# Install required system packages and dependencies
RUN install_packages libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libxml2 libxslt1.1 zlib1g
RUN bitnami-pkg unpack nginx-1.14.0-2 --checksum f79d3fdf697701c4eae346cf033bb17804021d83145d8df0e421ec7a6b1e384c
RUN bitnami-pkg unpack php-5.6.36-6 --checksum d8dd3793060a0ab555d9ae0cb807cfdb80d085d22f16ad3702abb018e35d851c
RUN bitnami-pkg unpack mysql-client-10.1.34-0 --checksum 2954d9390cb8b91dc924beacc179ed03050f6c5cb7ad328010cdbde1ab05c1e9
RUN bitnami-pkg unpack wordpress-4.9.7-0 --checksum 3ed5d1345e340a7953ff548f8f3195db0f7d2288f34ab00c919984a5c09ac3bc
COPY rootfs /
ENV ALLOW_EMPTY_PASSWORD="no" \
BITNAMI_APP_NAME="wordpress-nginx" \
BITNAMI_IMAGE_VERSION="4.9.7-php5-debian-8-r7" \
MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \
MARIADB_ROOT_PASSWORD="" \
MARIADB_ROOT_USER="root" \
MYSQL_CLIENT_CREATE_DATABASE_NAME="" \
MYSQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="ALL" \
MYSQL_CLIENT_CREATE_DATABASE_USER="" \
NGINX_DAEMON_GROUP="daemon" \
NGINX_DAEMON_USER="daemon" \
NGINX_HTTPS_PORT_NUMBER="443" \
NGINX_HTTP_PORT_NUMBER="80" \
PATH="/opt/bitnami/nginx/sbin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:$PATH" \
SMTP_HOST="" \
SMTP_PASSWORD="" \
SMTP_PORT="" \
SMTP_PROTOCOL="" \
SMTP_USER="" \
SMTP_USERNAME="" \
WORDPRESS_BLOG_NAME="User's Blog!" \
WORDPRESS_DATABASE_NAME="bitnami_wordpress" \
WORDPRESS_DATABASE_PASSWORD="" \
WORDPRESS_DATABASE_USER="bn_wordpress" \
WORDPRESS_EMAIL="user@example.com" \
WORDPRESS_FIRST_NAME="FirstName" \
WORDPRESS_HOST="" \
WORDPRESS_HTTPS_PORT="443" \
WORDPRESS_HTTP_PORT="80" \
WORDPRESS_LAST_NAME="LastName" \
WORDPRESS_PASSWORD="bitnami" \
WORDPRESS_TABLE_PREFIX="wp_" \
WORDPRESS_USERNAME="user"
EXPOSE 80 443
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["./run.sh"]

View File

@ -1,31 +0,0 @@
version: '2'
services:
mariadb:
image: 'bitnami/mariadb:latest'
volumes:
- 'mariadb_data:/bitnami'
environment:
- MARIADB_USER=bn_wordpress
- MARIADB_DATABASE=bitnami_wordpress
- ALLOW_EMPTY_PASSWORD=yes
wordpress:
image: 'bitnami/wordpress-nginx:4-php5'
ports:
- '80:80'
- '443:443'
volumes:
- 'wordpress_data:/bitnami'
- './wordpress-vhosts.conf:/bitnami/nginx/conf/vhosts/wordpress-vhosts.conf'
depends_on:
- mariadb
environment:
- MARIADB_HOST=mariadb
- MARIADB_PORT_NUMBER=3306
- WORDPRESS_DATABASE_USER=bn_wordpress
- WORDPRESS_DATABASE_NAME=bitnami_wordpress
- ALLOW_EMPTY_PASSWORD=yes
volumes:
mariadb_data:
driver: local
wordpress_data:
driver: local

View File

@ -1,14 +0,0 @@
#!/bin/bash -e
. /opt/bitnami/base/functions
. /opt/bitnami/base/helpers
print_welcome_page
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "./run.sh" ]]; then
. /init.sh
nami_initialize nginx php mysql-client wordpress
info "Starting wordpress... "
fi
exec tini -- "$@"

View File

@ -1,29 +0,0 @@
##
## @brief Helper function to show an error when a password is empty and exit
## param $1 Input name
##
empty_password_error() {
error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development."
exit 1
}
##
## @brief Helper function to show a warning when the ALLOW_EMPTY_PASSWORD flag is enabled
##
empty_password_enabled_warn() {
warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment."
}
# Validate passwords
if [[ "$ALLOW_EMPTY_PASSWORD" =~ ^(yes|Yes|YES)$ ]]; then
empty_password_enabled_warn
else
# Database creation by MySQL client
if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then
empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
fi
# WordPress database
if [[ -z "$WORDPRESS_DATABASE_PASSWORD" ]]; then
empty_password_error WORDPRESS_DATABASE_PASSWORD
fi
fi

View File

@ -1,11 +0,0 @@
{
"allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}",
"createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}",
"createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}",
"createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}",
"createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}",
"host": "{{$global.env.MARIADB_HOST}}",
"port": "{{$global.env.MARIADB_PORT_NUMBER}}",
"rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}",
"rootUser": "{{$global.env.MARIADB_ROOT_USER}}"
}

View File

@ -1,6 +0,0 @@
{
"httpPort": "{{$global.env.NGINX_HTTP_PORT_NUMBER}}",
"httpsPort": "{{$global.env.NGINX_HTTPS_PORT_NUMBER}}",
"systemGroup": "{{$global.env.NGINX_DAEMON_GROUP}}",
"systemUser": "{{$global.env.NGINX_DAEMON_USER}}"
}

View File

@ -1,15 +0,0 @@
#!/bin/bash
_forwardTerm () {
echo "Caugth signal SIGTERM, passing it to child processes..."
cpids=$(pgrep -P $$ | xargs)
kill -15 $cpids 2> /dev/null
wait
exit $?
}
trap _forwardTerm TERM
nami start --foreground php &
nami start --foreground nginx &
wait

View File

@ -1,23 +0,0 @@
{
"blogName": "{{$global.env.WORDPRESS_BLOG_NAME}}",
"databaseName": "{{$global.env.WORDPRESS_DATABASE_NAME}}",
"databasePassword": "{{$global.env.WORDPRESS_DATABASE_PASSWORD}}",
"databaseServerHost": "{{$global.env.MARIADB_HOST}}",
"databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
"databaseUser": "{{$global.env.WORDPRESS_DATABASE_USER}}",
"email": "{{$global.env.WORDPRESS_EMAIL}}",
"firstName": "{{$global.env.WORDPRESS_FIRST_NAME}}",
"host": "{{$global.env.WORDPRESS_HOST}}",
"httpPort": "{{$global.env.WORDPRESS_HTTP_PORT}}",
"httpsPort": "{{$global.env.WORDPRESS_HTTPS_PORT}}",
"lastName": "{{$global.env.WORDPRESS_LAST_NAME}}",
"password": "{{$global.env.WORDPRESS_PASSWORD}}",
"smtpHost": "{{$global.env.SMTP_HOST}}",
"smtpPassword": "{{$global.env.SMTP_PASSWORD}}",
"smtpPort": "{{$global.env.SMTP_PORT}}",
"smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}",
"smtpUser": "{{$global.env.SMTP_USER}}",
"smtpUsername": "{{$global.env.SMTP_USERNAME}}",
"tablePrefix": "{{$global.env.WORDPRESS_TABLE_PREFIX}}",
"username": "{{$global.env.WORDPRESS_USERNAME}}"
}

View File

@ -1,23 +0,0 @@
server {
listen 0.0.0.0:80;
server_name myapp.example.com;
root /opt/bitnami/wordpress;
index index.php;
location / {
try_files $uri $uri/ /index.php?q=$uri&$args;
}
if (!-e $request_filename)
{
rewrite ^/(.+)$ /index.php?q=$1 last;
}
location ~ \.php$ {
fastcgi_pass localhost:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
}

View File

@ -1,51 +0,0 @@
FROM bitnami/minideb-extras:jessie-r107
LABEL maintainer "Bitnami <containers@bitnami.com>"
# Install required system packages and dependencies
RUN install_packages libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libxml2 libxslt1.1 zlib1g
RUN bitnami-pkg unpack nginx-1.14.0-2 --checksum f79d3fdf697701c4eae346cf033bb17804021d83145d8df0e421ec7a6b1e384c
RUN bitnami-pkg unpack php-7.0.30-8 --checksum c9bcf8d4c9c280645e44de07ae4a0e8d436333688094d5587b4b0766036cff8a
RUN bitnami-pkg unpack mysql-client-10.1.34-0 --checksum 2954d9390cb8b91dc924beacc179ed03050f6c5cb7ad328010cdbde1ab05c1e9
RUN bitnami-pkg unpack wordpress-4.9.7-0 --checksum 3ed5d1345e340a7953ff548f8f3195db0f7d2288f34ab00c919984a5c09ac3bc
COPY rootfs /
ENV ALLOW_EMPTY_PASSWORD="no" \
BITNAMI_APP_NAME="wordpress-nginx" \
BITNAMI_IMAGE_VERSION="4.9.7-debian-8-r7" \
MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \
MARIADB_ROOT_PASSWORD="" \
MARIADB_ROOT_USER="root" \
MYSQL_CLIENT_CREATE_DATABASE_NAME="" \
MYSQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="ALL" \
MYSQL_CLIENT_CREATE_DATABASE_USER="" \
NGINX_DAEMON_GROUP="daemon" \
NGINX_DAEMON_USER="daemon" \
NGINX_HTTPS_PORT_NUMBER="443" \
NGINX_HTTP_PORT_NUMBER="80" \
PATH="/opt/bitnami/nginx/sbin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:$PATH" \
SMTP_HOST="" \
SMTP_PASSWORD="" \
SMTP_PORT="" \
SMTP_PROTOCOL="" \
SMTP_USER="" \
SMTP_USERNAME="" \
WORDPRESS_BLOG_NAME="User's Blog!" \
WORDPRESS_DATABASE_NAME="bitnami_wordpress" \
WORDPRESS_DATABASE_PASSWORD="" \
WORDPRESS_DATABASE_USER="bn_wordpress" \
WORDPRESS_EMAIL="user@example.com" \
WORDPRESS_FIRST_NAME="FirstName" \
WORDPRESS_HOST="" \
WORDPRESS_HTTPS_PORT="443" \
WORDPRESS_HTTP_PORT="80" \
WORDPRESS_LAST_NAME="LastName" \
WORDPRESS_PASSWORD="bitnami" \
WORDPRESS_TABLE_PREFIX="wp_" \
WORDPRESS_USERNAME="user"
EXPOSE 80 443
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["./run.sh"]

View File

@ -1,31 +0,0 @@
version: '2'
services:
mariadb:
image: 'bitnami/mariadb:latest'
volumes:
- 'mariadb_data:/bitnami'
environment:
- MARIADB_USER=bn_wordpress
- MARIADB_DATABASE=bitnami_wordpress
- ALLOW_EMPTY_PASSWORD=yes
wordpress:
image: 'bitnami/wordpress-nginx:4'
ports:
- '80:80'
- '443:443'
volumes:
- 'wordpress_data:/bitnami'
- './wordpress-vhosts.conf:/bitnami/nginx/conf/vhosts/wordpress-vhosts.conf'
depends_on:
- mariadb
environment:
- MARIADB_HOST=mariadb
- MARIADB_PORT_NUMBER=3306
- WORDPRESS_DATABASE_USER=bn_wordpress
- WORDPRESS_DATABASE_NAME=bitnami_wordpress
- ALLOW_EMPTY_PASSWORD=yes
volumes:
mariadb_data:
driver: local
wordpress_data:
driver: local

View File

@ -1,14 +0,0 @@
#!/bin/bash -e
. /opt/bitnami/base/functions
. /opt/bitnami/base/helpers
print_welcome_page
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "./run.sh" ]]; then
. /init.sh
nami_initialize nginx php mysql-client wordpress
info "Starting wordpress... "
fi
exec tini -- "$@"

View File

@ -1,29 +0,0 @@
##
## @brief Helper function to show an error when a password is empty and exit
## param $1 Input name
##
empty_password_error() {
error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development."
exit 1
}
##
## @brief Helper function to show a warning when the ALLOW_EMPTY_PASSWORD flag is enabled
##
empty_password_enabled_warn() {
warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment."
}
# Validate passwords
if [[ "$ALLOW_EMPTY_PASSWORD" =~ ^(yes|Yes|YES)$ ]]; then
empty_password_enabled_warn
else
# Database creation by MySQL client
if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then
empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
fi
# WordPress database
if [[ -z "$WORDPRESS_DATABASE_PASSWORD" ]]; then
empty_password_error WORDPRESS_DATABASE_PASSWORD
fi
fi

View File

@ -1,11 +0,0 @@
{
"allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}",
"createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}",
"createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}",
"createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}",
"createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}",
"host": "{{$global.env.MARIADB_HOST}}",
"port": "{{$global.env.MARIADB_PORT_NUMBER}}",
"rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}",
"rootUser": "{{$global.env.MARIADB_ROOT_USER}}"
}

View File

@ -1,6 +0,0 @@
{
"httpPort": "{{$global.env.NGINX_HTTP_PORT_NUMBER}}",
"httpsPort": "{{$global.env.NGINX_HTTPS_PORT_NUMBER}}",
"systemGroup": "{{$global.env.NGINX_DAEMON_GROUP}}",
"systemUser": "{{$global.env.NGINX_DAEMON_USER}}"
}

View File

@ -1,15 +0,0 @@
#!/bin/bash
_forwardTerm () {
echo "Caugth signal SIGTERM, passing it to child processes..."
cpids=$(pgrep -P $$ | xargs)
kill -15 $cpids 2> /dev/null
wait
exit $?
}
trap _forwardTerm TERM
nami start --foreground php &
nami start --foreground nginx &
wait

View File

@ -1,23 +0,0 @@
{
"blogName": "{{$global.env.WORDPRESS_BLOG_NAME}}",
"databaseName": "{{$global.env.WORDPRESS_DATABASE_NAME}}",
"databasePassword": "{{$global.env.WORDPRESS_DATABASE_PASSWORD}}",
"databaseServerHost": "{{$global.env.MARIADB_HOST}}",
"databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
"databaseUser": "{{$global.env.WORDPRESS_DATABASE_USER}}",
"email": "{{$global.env.WORDPRESS_EMAIL}}",
"firstName": "{{$global.env.WORDPRESS_FIRST_NAME}}",
"host": "{{$global.env.WORDPRESS_HOST}}",
"httpPort": "{{$global.env.WORDPRESS_HTTP_PORT}}",
"httpsPort": "{{$global.env.WORDPRESS_HTTPS_PORT}}",
"lastName": "{{$global.env.WORDPRESS_LAST_NAME}}",
"password": "{{$global.env.WORDPRESS_PASSWORD}}",
"smtpHost": "{{$global.env.SMTP_HOST}}",
"smtpPassword": "{{$global.env.SMTP_PASSWORD}}",
"smtpPort": "{{$global.env.SMTP_PORT}}",
"smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}",
"smtpUser": "{{$global.env.SMTP_USER}}",
"smtpUsername": "{{$global.env.SMTP_USERNAME}}",
"tablePrefix": "{{$global.env.WORDPRESS_TABLE_PREFIX}}",
"username": "{{$global.env.WORDPRESS_USERNAME}}"
}

View File

@ -1,23 +0,0 @@
server {
listen 0.0.0.0:80;
server_name myapp.example.com;
root /opt/bitnami/wordpress;
index index.php;
location / {
try_files $uri $uri/ /index.php?q=$uri&$args;
}
if (!-e $request_filename)
{
rewrite ^/(.+)$ /index.php?q=$1 last;
}
location ~ \.php$ {
fastcgi_pass localhost:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
}