Skip to content

Commit

Permalink
Add init-docker-secrets dependency, update doc
Browse files Browse the repository at this point in the history
  • Loading branch information
xZero707 committed Oct 29, 2024
1 parent 53c16e5 commit 696e1ae
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ Attempt to fix several of WordPress anti-patterns in ready to deploy container
* If you have custom scripts, you should review them and migrate to new format
* S6 supervisor v3 brings many improvements and bugfixes in addition to performance improvements
* This change is necessary to ensure compatibility with future base image updates
- 2024-10-28 Deprecate docker hub images
* Done as protest against Docker Hub's hostile behavior towards open source community
* All images will be removed from docker hub
* Please use ghcr.io/n0rthernl1ghts/wordpress instead
- 2024-10-28 Multiple changes
* Deprecate docker hub images
* Add WordPress versions 6.5.3 -> 6.6.2
* Add support for docker secrets

#### Public builds (docker)

Expand Down Expand Up @@ -122,5 +122,5 @@ COPY --from=wp-plugins-installer ["/var/www/html/wp-content/plugins", "/var/www/
* ~Install/update plugins on the fly using wp cli (with versioning)~
* Install/update themes on the fly using wp cli (with versioning)
* ~Apply theme and eventual plugin customizations using patch files~ (Partial)
* Support automatic install using ENV
* ~Support automatic install using ENV~
* Create users automatically using ENV
Empty file.
2 changes: 1 addition & 1 deletion rootfs/etc/s6-overlay/s6-rc.d/init-install-wordpress/run
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ main() {
return 1
fi

wp core install \
s6-envdir /run/secrets_normalized wp core install \
--url="${WORDPRESS_INIT_SITE_URL:?}" \
--title="${WORDPRESS_INIT_SITE_TITLE:-WordPress}" \
--admin_user="${WORDPRESS_INIT_ADMIN_USER:?}" \
Expand Down
Empty file.
2 changes: 2 additions & 0 deletions rootfs/etc/s6-overlay/s6-rc.d/init-wpconfig-verify/run
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ main() {
# This will prepend service name to all output from here
exec > >(while read -r line; do echo "[init-wpconfig-verify] ${line}"; done) 2>&1

source /usr/local/bin/load_secrets

echo "Checking salts..."
if ! checkSaltsEnv; then
echo "^^^ Some or all of the salts are not set. Cannot continue."
Expand Down

0 comments on commit 696e1ae

Please sign in to comment.