Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jtrouth committed Dec 20, 2023
1 parent eff6981 commit d70fa03
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN apt-get update && apt-get -qq install \
libmagickwand-dev \
libzip-dev \
libmemcached-dev \
# memcached \
memcached \
jq \
libonig-dev \
python3.10 \
Expand All @@ -38,7 +38,7 @@ COPY supervisord.conf /etc/supervisord.conf
RUN pecl install \
imagick \
memcached \
# memcache \
memcache \
redis \
xdebug \
zlib
Expand Down
12 changes: 4 additions & 8 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
#!/bin/bash
set -e

# Link Apache log files to output
ln -sf /proc/$$/fd/1 /var/log/apache2/access.log
ln -sf /proc/$$/fd/2 /var/log/apache2/error.log

# Install composer packages
./craft update/composer-install --interactive=0

# Run pending structural migrations
# ./craft migrate/all --no-backup --no-content --interactive=0
./craft migrate/all --no-backup --no-content --interactive=0

# Apply changes from project config yaml files
# ./craft project-config/apply --force
./craft project-config/apply --force

# Run pending content migrations
# ./craft migrate --track=content --interactive=0
./craft migrate --track=content --interactive=0

# Clear caches
# ./craft clear-caches/all
./craft clear-caches/all

# https://docs.docker.com/engine/reference/builder/#exec-form-entrypoint-example
exec "$@"
2 changes: 1 addition & 1 deletion php.ini-production
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ default_socket_timeout = 60
;;;;;;;;;;;;;;;;;;;

[Otel instrumentation]
extension=otel_instrumentation.so
; extension=otel_instrumentation.so

[CLI Server]
; Whether the CLI web server uses ANSI color coding in its terminal output.
Expand Down

0 comments on commit d70fa03

Please sign in to comment.