Skip to content

Commit

Permalink
Fix deploy path (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
wilson1000-MoJ authored Jan 9, 2024
1 parent b70f634 commit 7885603
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ RUN npm run production

FROM nginxinc/nginx-unprivileged:1.25-alpine AS nginx

COPY ops/conf/production/php-fpm.conf /etc/nginx/php-fpm.conf
COPY ops/conf/production/server.conf /etc/nginx/conf.d/default.conf
COPY deploy/config/php-fpm.conf /etc/nginx/php-fpm.conf
COPY deploy/config/server.conf /etc/nginx/conf.d/default.conf
COPY --from=assets-build /code/public /var/www/html/public/
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ port-forward:
@$(k8s_pod) | echo $$(cat -)" "$(k8s_prt) | xargs kubectl -n $(k8s_nsp) port-forward

apply:
kubectl apply -f ops/deploy/local
kubectl apply -f deploy/local

unapply:
@$(k8s_pod) | xargs kubectl -n $(k8s_nsp) delete pod

apply-production:
kubectl apply -f ops/deploy/production
kubectl apply -f deploy/production

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ services:
image: nginxinc/nginx-unprivileged:1.25-alpine
volumes:
- dist:/var/www/html/public/app/themes/justice/dist
- ./ops/conf/local/php-fpm.conf:/etc/nginx/php-fpm.conf
- ./ops/conf/local/server.conf:/etc/nginx/conf.d/default.conf
- ./deploy/config/local/php-fpm.conf:/etc/nginx/php-fpm.conf
- ./deploy/config/local/server.conf:/etc/nginx/conf.d/default.conf
- ./public:/var/www/html/public
environment:
VIRTUAL_HOST: ${SERVER_NAME}
Expand Down

0 comments on commit 7885603

Please sign in to comment.