Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-24 07:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from bitnami/always-chown

Browse Source 
Always chown
This commit is contained in:
Miguel Ángel Martínez Triviño
2015-06-20 19:14:33 -07:00
parent 742d8ec76c 34c88279ad
commit e2aa035ea2
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bitnami/php-fpm/entrypoint.sh
View File

@@ -6,7 +6,8 @@ print_welcome_page
sudo chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER \
$BITNAMI_APP_VOL_PREFIX/conf/ \
$BITNAMI_APP_VOL_PREFIX/logs/ || true
$BITNAMI_APP_VOL_PREFIX/logs/ \
/app || true
if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
generate_conf_files $BITNAMI_APP_DIR/etc

15
bitnami/php-fpm/test.sh
View File

@@ -5,6 +5,7 @@ IMAGE_NAME=bitnami/php-fpm
NGINX_IMAGE_NAME=bitnami/nginx
SLEEP_TIME=3
VOL_PREFIX=/bitnami/php-fpm
HOST_VOL_PREFIX=/tmp/bitnami/php-fpm
cleanup_running_containers() {
if [ "$(docker ps -a | grep $CONTAINER_NAME)" ]; then
@@ -17,8 +18,7 @@ cleanup_running_containers() {
}
create_container(){
cleanup_running_containers
docker run -d --name $CONTAINER_NAME $IMAGE_NAME
docker run -d --name $CONTAINER_NAME "$@" $IMAGE_NAME
}
add_vhost() {
@@ -34,7 +34,7 @@ create_nginx_container(){
}
setup () {
create_container
cleanup_running_containers
}
teardown() {
@@ -42,6 +42,7 @@ teardown() {
}
@test "php and php-fpm installed" {
create_container
run docker exec $CONTAINER_NAME php -v
[ "$status" = 0 ]
run docker exec $CONTAINER_NAME php-fpm -v
@@ -49,6 +50,7 @@ teardown() {
}
@test "winter is coming via nginx" {
create_container
docker exec $CONTAINER_NAME sh -c "echo '<?php echo \"Winter is coming\"; ?>' > index.php"
create_nginx_container
run docker exec $NGINX_CONTAINER_NAME curl 127.0.0.1:81/index.php
@@ -56,9 +58,16 @@ teardown() {
}
@test "required volumes exposed" {
create_container
run docker inspect $CONTAINER_NAME
[[ "$output" =~ "/app" ]]
[[ "$output" =~ "$VOL_PREFIX/logs" ]]
[[ "$output" =~ "$VOL_PREFIX/conf" ]]
}
@test "Data gets generated in conf if bind mounted in the host" {
create_container -v $HOST_VOL_PREFIX/conf:$VOL_PREFIX/conf -v $HOST_VOL_PREFIX/logs:$VOL_PREFIX/logs
run docker run --rm -v $HOST_VOL_PREFIX:$HOST_VOL_PREFIX $IMAGE_NAME ls -l $HOST_VOL_PREFIX/conf/php-fpm.conf $HOST_VOL_PREFIX/logs/php-fpm.log
[ $status = 0 ]
docker run --rm -v $HOST_VOL_PREFIX:$HOST_VOL_PREFIX $IMAGE_NAME sh -c "sudo rm -rf $HOST_VOL_PREFIX/*"
}