Skip to content

Commit

Permalink
fix(docker): add execute permission to Laminas binary in CLI image (#180
Browse files Browse the repository at this point in the history
)
  • Loading branch information
JoshuaLicense authored Jul 18, 2024
1 parent cda9817 commit da12d1b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
20 changes: 17 additions & 3 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ services:
VIRTUAL_HOST: api.local.olcs.dev-dvsacloud.uk
VIRTUAL_PORT: 8080

cli:
build:
context: infra/docker/cli
target: development
tty: true
volumes:
- ./app/api:/var/www/html
environment:
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
PHP_IDE_CONFIG: "serverName=vol.local.api"

selfserve:
build:
context: infra/docker/selfserve
Expand Down Expand Up @@ -66,9 +79,10 @@ services:
image: node:20
volumes:
- ./app/cdn:/var/www/html
tty: true
ports:
- 7001:7001
working_dir: /var/www/html
command: bash -c "npm install && npm start"
expose:
- 7001
environment:
VIRTUAL_HOST: cdn.local.olcs.dev-dvsacloud.uk
VIRTUAL_PORT: 7001
Expand Down
4 changes: 3 additions & 1 deletion infra/docker/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ RUN chown -R root:www-data /var/www/html \
# Add group (`www-data`) write permissions to the cache directory files.
&& chmod -R 664 /var/www/html/data/cache \
# Add group (`www-data`) write permissions on the cache directories.
&& find /var/www/html/data/cache -type d -exec chmod 775 {} \;
&& find /var/www/html/data/cache -type d -exec chmod 775 {} \; \
# Ensure Laminas binary is executable for CLI jobs.
&& chmod +x /var/www/html/vendor/bin/laminas

USER www-data

Expand Down

0 comments on commit da12d1b

Please sign in to comment.