mirror_php/LinkAce
1
0
Fork 0
mirror of https://github.com/Kovah/LinkAce.git synced 2025-04-15 20:24:05 +02:00
Code Issues Releases Wiki Activity

Correct the production docker-compose files and release Dockerfiles

Browse Source
This commit is contained in:
Kovah 2021-03-22 23:27:24 +01:00
parent de70173b6e
commit b005866397
No known key found for this signature in database
GPG Key ID: AAAA031BA9830D7B
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.production-simple.yml
View File

@ -22,8 +22,8 @@ services:
depends_on:
- db
ports:
- "0.0.0.0:80:8080"
#- "0.0.0.0:443:8443"
- "0.0.0.0:80:80"
#- "0.0.0.0:443:443"
volumes:
- ./.env:/app/.env
- linkace_logs:/app/storage/logs

4
docker-compose.production.yml
View File

@ -33,8 +33,8 @@ services:
image: bitnami/nginx:1.19
restart: unless-stopped
ports:
- "0.0.0.0:80:8080"
#- "0.0.0.0:443:8443"
- "0.0.0.0:80:80"
#- "0.0.0.0:443:443"
depends_on:
- app
volumes:

8
resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile
View File

@ -61,10 +61,6 @@ COPY ./package.json /app
COPY ./server.php /app
COPY ./.env.example /app/.env
# Copy the PHP and nginx config files
COPY ./resources/docker/php/php.ini /usr/local/etc/php/php.ini
COPY ./resources/docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf
# Install nginx, MySQL Dump for automated backups and other dependencies
RUN apk add --no-cache mariadb-client nginx supervisor postgresql postgresql-dev zip libzip-dev ; \
docker-php-ext-configure zip ; \
@ -78,6 +74,10 @@ RUN mkdir /etc/supervisor.d/; \
ln -sf /dev/stderr /var/log/nginx/error.log
COPY ./resources/docker/supervisord.ini /etc/supervisor.d/supervisord.ini
# Copy the PHP and nginx config files
COPY ./resources/docker/php/php.ini /usr/local/etc/php/php.ini
COPY ./resources/docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf
# Copy files from the composer build
COPY --from=builder /app/vendor /app/vendor
COPY --from=builder /app/bootstrap/cache /app/bootstrap/cache

8
resources/docker/dockerfiles/release-multiplatform.Dockerfile
View File

@ -61,16 +61,16 @@ COPY ./package.json /app
COPY ./server.php /app
COPY ./.env.example /app/.env
# Copy the PHP and nginx config files
COPY ./resources/docker/php/php.ini /usr/local/etc/php/php.ini
COPY ./resources/docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf
# Install nginx, MySQL Dump for automated backups and other dependencies
RUN apk add --no-cache mariadb-client postgresql postgresql-dev zip libzip-dev ; \
docker-php-ext-configure zip ; \
docker-php-ext-install bcmath pdo_mysql pdo_pgsql zip ; \
mkdir /ssl-certs
# Copy the PHP and nginx config files
COPY ./resources/docker/php/php.ini /usr/local/etc/php/php.ini
COPY ./resources/docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf
# Copy files from the composer build
COPY --from=builder /app/vendor /app/vendor
COPY --from=builder /app/bootstrap/cache /app/bootstrap/cache