Skip to content
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.

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

fix(docker): add execute permission to Laminas binary in CLI image #180

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading