Skip to content

Change permissions handling to be more conservative #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2015
Merged

Change permissions handling to be more conservative #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ ENV WORDPRESS_SHA1 9e9745bb8a1166622de866076eac73a49cb3eba0
RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
&& echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
&& tar -xzf wordpress.tar.gz -C /usr/src/ \
&& rm wordpress.tar.gz
&& rm wordpress.tar.gz \
&& chown -R www-data:www-data /usr/src/wordpress

COPY docker-entrypoint.sh /entrypoint.sh

Expand Down
4 changes: 2 additions & 2 deletions apache/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ if ! [ -e index.php -a -e wp-includes/version.php ]; then
</IfModule>
# END WordPress
EOF
chown www-data:www-data .htaccess
fi
fi

Expand All @@ -70,6 +71,7 @@ if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROT
}

EOPHP
chown www-data:www-data wp-config.php
fi

set_config() {
Expand Down Expand Up @@ -140,6 +142,4 @@ if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_strin
$mysql->close();
EOPHP

chown -R www-data:www-data .

exec "$@"
4 changes: 2 additions & 2 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ if ! [ -e index.php -a -e wp-includes/version.php ]; then
</IfModule>
# END WordPress
EOF
chown www-data:www-data .htaccess
fi
fi

Expand All @@ -70,6 +71,7 @@ if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROT
}

EOPHP
chown www-data:www-data wp-config.php
fi

set_config() {
Expand Down Expand Up @@ -140,6 +142,4 @@ if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_strin
$mysql->close();
EOPHP

chown -R www-data:www-data .

exec "$@"
3 changes: 2 additions & 1 deletion fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ ENV WORDPRESS_SHA1 9e9745bb8a1166622de866076eac73a49cb3eba0
RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
&& echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
&& tar -xzf wordpress.tar.gz -C /usr/src/ \
&& rm wordpress.tar.gz
&& rm wordpress.tar.gz \
&& chown -R www-data:www-data /usr/src/wordpress

COPY docker-entrypoint.sh /entrypoint.sh

Expand Down
4 changes: 2 additions & 2 deletions fpm/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ if ! [ -e index.php -a -e wp-includes/version.php ]; then
</IfModule>
# END WordPress
EOF
chown www-data:www-data .htaccess
fi
fi

Expand All @@ -70,6 +71,7 @@ if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROT
}

EOPHP
chown www-data:www-data wp-config.php
fi

set_config() {
Expand Down Expand Up @@ -140,6 +142,4 @@ if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_strin
$mysql->close();
EOPHP

chown -R www-data:www-data .

exec "$@"