Fetch remove images
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Philipp Lang 2023-07-20 20:28:19 +02:00
parent 437125b573
commit 81b21f5d7f
4 changed files with 13 additions and 25 deletions

View File

@ -1,7 +1,7 @@
APP_NAME="Adrema" APP_NAME="Adrema"
APP_ENV=local APP_ENV=production
APP_KEY=YOUR_APP_KEY APP_KEY=YOUR_APP_KEY
APP_DEBUG=true APP_DEBUG=false
APP_URL=http://localhost:8000 APP_URL=http://localhost:8000
APP_MODE=stamm APP_MODE=stamm
@ -13,3 +13,6 @@ MAIL_PASSWORD=null
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME=me MAIL_FROM_NAME=me
DB_PASSWORD=secret_db_password
MYSQL_PASSWORD=secret_db_password

View File

@ -13,7 +13,7 @@ WORKDIR /app
RUN apt-get update RUN apt-get update
RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip
RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra
RUN docker-php-ext-install pdo_mysql curl gd intl mbstring pcntl RUN docker-php-ext-install pdo_mysql curl gd exif intl mbstring pcntl
RUN pecl install redis && docker-php-ext-enable redis RUN pecl install redis && docker-php-ext-enable redis
COPY --chown=www-data:www-data . /app COPY --chown=www-data:www-data . /app
COPY --chown=www-data:www-data --from=node /app/public /app/public COPY --chown=www-data:www-data --from=node /app/public /app/public

View File

@ -32,7 +32,7 @@ steps:
- apt-get update > /dev/null - apt-get update > /dev/null
- apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip > /dev/null - apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip > /dev/null
- apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra > /dev/null - apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra > /dev/null
- docker-php-ext-install pdo_mysql curl gd intl mbstring pcntl > /dev/null - docker-php-ext-install pdo_mysql curl gd exif intl mbstring pcntl > /dev/null
- pecl install redis && docker-php-ext-enable redis > /dev/null - pecl install redis && docker-php-ext-enable redis > /dev/null
- php artisan migrate - php artisan migrate
- php artisan test - php artisan test

View File

@ -1,43 +1,29 @@
version: '3' version: '3'
services: services:
webservice: webservice:
build: image: zoomyboy/adrema-webservice:latest
context: .
dockerfile: ./.docker/nginx.Dockerfile
image: nginx:1.21.6-alpine
container_name: nginx
depends_on: depends_on:
- php - php
ports: ports:
- '8000:80' - '8000:80'
volumes:
- ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
php: php:
build: image: zoomyboy/adrema-app:latest
context: .
dockerfile: ./.docker/php.Dockerfile
container_name: php
depends_on: depends_on:
- db - db
command: php-fpm -F -R
env_file: env_file:
- .app.env - .app.env
environment: environment:
DB_HOST: db DB_HOST: db
DB_DATABASE: db DB_DATABASE: db
DB_USERNAME: db DB_USERNAME: db
DB_PASSWORD: secret
QUEUE_CONNECTION: redis QUEUE_CONNECTION: redis
XELATEX_BIN: /usr/bin/xelatex XELATEX_BIN: /usr/bin/xelatex
PDFLATEX_BIN: /usr/bin/pdflatex PDFLATEX_BIN: /usr/bin/pdflatex
REDIS_HOST: redis REDIS_HOST: redis
horizon: horizon:
build: image: zoomyboy/adrema-app:latest
context: .
dockerfile: ./.docker/php.Dockerfile
container_name: horizon
depends_on: depends_on:
- db - db
- php - php
@ -48,7 +34,6 @@ services:
DB_HOST: db DB_HOST: db
DB_DATABASE: db DB_DATABASE: db
DB_USERNAME: db DB_USERNAME: db
DB_PASSWORD: secret
QUEUE_CONNECTION: redis QUEUE_CONNECTION: redis
XELATEX_BIN: /usr/bin/xelatex XELATEX_BIN: /usr/bin/xelatex
PDFLATEX_BIN: /usr/bin/pdflatex PDFLATEX_BIN: /usr/bin/pdflatex
@ -56,10 +41,10 @@ services:
db: db:
image: mariadb:10.6.5 image: mariadb:10.6.5
container_name: db env_file:
- .app.env
environment: environment:
MARIADB_ROOT_PASSWORD: secret_root_password MARIADB_RANDOM_ROOT_PASSWORD: yes
MYSQL_PASSWORD: secret
MYSQL_DATABASE: db MYSQL_DATABASE: db
MYSQL_USER: db MYSQL_USER: db
volumes: volumes: