Skip to content

Commit

Permalink
done
Browse files Browse the repository at this point in the history
  • Loading branch information
sethsandaru committed Feb 7, 2024
1 parent fa69e34 commit 005c089
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN chown -R www-data:www-data storage/app
RUN chmod -R 777 storage/logs

RUN touch /var/www/html/docking.sqlite
RUN chmod -R 777 docking.sqlite
RUN chown www-data:www-data docking.sqlite

# Nginx remove default site
RUN rm /etc/nginx/sites-enabled/default
Expand All @@ -47,7 +47,7 @@ EXPOSE 80
ENV APP_ENV="production"
ENV APP_KEY="base64:/UnGygYvVBmIh+VgNhMj6MyI/ieXTtzUJsUL4OUtZGI="
ENV DB_CONNECTION="sqlite"
ENV DATABASE_URL="sqlite:/var/www/html/docking.sqlite"
ENV DATABASE_URL="sqlite:////var/www/html/docking.sqlite"

############# Storage ENV

Expand Down
17 changes: 7 additions & 10 deletions .docker/octane.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
### Docking Development Image - Octane Mode
# Single image to rule them all
# PHP 8.2
# SQLite
# Local Storage
# Supervisor to run 5 concurrent workers
FROM ghcr.io/roadrunner-server/roadrunner:latest AS roadrunner
FROM php:8.2-fpm

Expand Down Expand Up @@ -31,6 +25,9 @@ COPY . .
COPY ./.docker/docking-octane.conf /etc/supervisor/conf.d/
COPY ./.docker/docking-host-octane.conf /etc/nginx/conf.d/default.conf

RUN cp .docker/entrypoint.sh /entrypoint
RUN chmod +x /entrypoint

# The bundle already built, no need to keep this to save size
RUN rm -rf ./node_modules

Expand All @@ -42,7 +39,7 @@ RUN chown -R www-data:www-data storage/app
RUN chmod -R 777 storage/logs

RUN touch /var/www/html/docking.sqlite
RUN chmod -R 777 docking.sqlite
RUN chown www-data:www-data docking.sqlite

# Nginx remove default site
RUN rm /etc/nginx/sites-enabled/default
Expand All @@ -53,7 +50,7 @@ EXPOSE 80
ENV APP_ENV="production"
ENV APP_KEY="base64:/UnGygYvVBmIh+VgNhMj6MyI/ieXTtzUJsUL4OUtZGI="
ENV DB_CONNECTION="sqlite"
ENV DATABASE_URL="sqlite:/var/www/html/docking.sqlite"
ENV DATABASE_URL="sqlite:////var/www/html/docking.sqlite"

############# Storage ENV

Expand All @@ -63,8 +60,8 @@ ENV FILESYSTEM_DISK=public
# if select s3, these must be defined
ENV AWS_ACCESS_KEY_ID=""
ENV AWS_SECRET_ACCESS_KEY=""
ENV AWS_DEFAULT_REGION=""
ENV AWS_BUCKET=""
ENV AWS_DEFAULT_REGION="ap-southeast-1"
ENV AWS_BUCKET="shipsaas-docking"

############# Docking Config
ENV DOCKING_PUBLIC_ACCESS_KEY=""
Expand Down

0 comments on commit 005c089

Please sign in to comment.