Skip to content

Commit

Permalink
use correct docker build context and reference Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
mszulik committed Jan 16, 2024
1 parent a470502 commit 9669235
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:
uses: docker/build-push-action@v5
with:
push: true
context: ./docker
file: ./docker/Dockerfile
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
16 changes: 0 additions & 16 deletions docker-compose.prod.yml

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose.pullpreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ services:
app:
container_name: ${APP_CONTAINER_NAME:-transmorpher}
build:
context: ./docker
dockerfile: Dockerfile
context: .
dockerfile: ./docker/Dockerfile
networks:
- traefik
- internal
Expand Down
12 changes: 6 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ LABEL com.centurylinklabs.watchtower.lifecycle.post-update-timeout="1440"
# Watchtower will run this script after restarting the updated container.
LABEL com.centurylinklabs.watchtower.lifecycle.post-update="/var/www/html/docker/watchtower.sh"

COPY ../ /var/www/html
COPY ./workers.conf /opt/docker/etc/supervisor.d/
COPY . /var/www/html
COPY ./docker/workers.conf /opt/docker/etc/supervisor.d/

RUN composer install --no-interaction --no-dev

RUN chmod +x ./docker/entryfile.sh
RUN chmod +x ./docker/watchtower.sh
RUN chmod +x /var/www/html/docker/entryfile.sh
RUN chmod +x /var/www/html/docker/watchtower.sh
RUN chmod 755 -R /var/www/html/storage
RUN chown -R application:application /var/www/html/storage

RUN php artisan storage:link
RUN php /var/www/html/artisan storage:link

RUN apt update
RUN apt install -y imagemagick jpegoptim optipng pngquant gifsicle webp ffmpeg

RUN docker-service-enable cron
RUN docker-cronjob '0 2 * * * application php /var/www/html/artisan ffmpeg:delete-temp
ENTRYPOINT ["./entryfile.sh"]
ENTRYPOINT ["/var/www/html/docker/entryfile.sh"]

0 comments on commit 9669235

Please sign in to comment.