Skip to content
Snippets Groups Projects
Commit 47e289fe authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

added worker and scheduler

parent 63a78f77
No related branches found
No related tags found
2 merge requests!1973Development,!1934Resolve "Update Images"
.git .git
\ No newline at end of file metager/vendor
\ No newline at end of file
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"request": "launch", "request": "launch",
"port": 9003, "port": 9003,
"pathMappings": { "pathMappings": {
"/html": "${workspaceRoot}" "/metager/metager_app": "${workspaceRoot}/metager"
} }
}, },
{ {
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"program": "${file}", "program": "${file}",
"cwd": "${fileDirname}", "cwd": "${fileDirname}",
"pathMappings": { "pathMappings": {
"/html": "${workspaceRoot}" "/metager/metager_app": "${workspaceRoot}/metager"
} }
} }
] ]
......
...@@ -22,7 +22,7 @@ RUN groupadd -g ${GID} metager && \ ...@@ -22,7 +22,7 @@ RUN groupadd -g ${GID} metager && \
RUN apt update && apt install -y \ RUN apt update && apt install -y \
libzip-dev \ libzip-dev \
libpng-dev && \ libpng-dev && \
docker-php-ext-install zip gd && \ docker-php-ext-install zip gd pcntl && \
yes '' | pecl install redis-5.3.7 xdebug-3.1.4 && \ yes '' | pecl install redis-5.3.7 xdebug-3.1.4 && \
docker-php-ext-enable redis && \ docker-php-ext-enable redis && \
docker-php-ext-enable --ini-name=xdebug.ini xdebug docker-php-ext-enable --ini-name=xdebug.ini xdebug
...@@ -36,10 +36,6 @@ WORKDIR /metager/metager_app ...@@ -36,10 +36,6 @@ WORKDIR /metager/metager_app
RUN mkdir /composer_cache && \ RUN mkdir /composer_cache && \
chown metager:metager /composer_cache chown metager:metager /composer_cache
VOLUME [ "/composer_cache" ] VOLUME [ "/composer_cache" ]
# Add composer vendor Directory
RUN mkdir -p /metager/metager_app/vendor && \
chown metager:metager /metager/metager_app/vendor
VOLUME [ "metager/metager_app/vendor" ]
# Add General Customizations to php.ini # Add General Customizations to php.ini
ADD build/fpm/configuration/php/custom.ini $PHP_INI_DIR/conf.d/custom.ini ADD build/fpm/configuration/php/custom.ini $PHP_INI_DIR/conf.d/custom.ini
......
...@@ -2,7 +2,6 @@ version: "3" ...@@ -2,7 +2,6 @@ version: "3"
# Volumes # Volumes
volumes: volumes:
vendor: {}
composer_cache: {} composer_cache: {}
node_cache: {} node_cache: {}
node_modules: {} node_modules: {}
...@@ -15,18 +14,45 @@ services: ...@@ -15,18 +14,45 @@ services:
context: ./ context: ./
dockerfile: build/fpm/Dockerfile dockerfile: build/fpm/Dockerfile
target: ${APP_ENV} target: ${APP_ENV}
restart: unless-stopped
volumes: volumes:
- ./metager:/metager/metager_app - ./metager:/metager/metager_app
- vendor:/metager/metager_app/vendor healthcheck:
test: "curl -f http://nginx:8080/health-check/liveness"
nginx: nginx:
build: build:
context: ./ context: ./
dockerfile: build/nginx/Dockerfile dockerfile: build/nginx/Dockerfile
target: ${APP_ENV} target: ${APP_ENV}
restart: unless-stopped
depends_on:
- fpm
volumes: volumes:
- ./metager/public:/metager/metager_app/public - ./metager/public:/metager/metager_app/public
ports: ports:
- 8080:8080 - 8080:8080
healthcheck:
test: "curl -f http://nginx:8080/health-check/liveness"
scheduler:
build:
<<: *fpm_build
restart: unless-stopped
entrypoint: /usr/local/bin/php
command: artisan schedule:work
volumes:
- ./metager:/metager/metager_app
healthcheck:
test: "curl -f http://nginx:8080/health-check/liveness-scheduler"
worker:
build:
<<: *fpm_build
restart: unless-stopped
entrypoint: /usr/local/bin/php
command: artisan requests:fetcher
volumes:
- ./metager:/metager/metager_app
healthcheck:
test: "curl -f http://nginx:8080/health-check/liveness-worker"
composer: composer:
build: build:
...@@ -37,11 +63,13 @@ services: ...@@ -37,11 +63,13 @@ services:
- COMPOSER_HOME=/composer_cache - COMPOSER_HOME=/composer_cache
volumes: volumes:
- ./metager:/metager/metager_app - ./metager:/metager/metager_app
- vendor:/metager/metager_app/vendor
- composer_cache:/composer_cache - composer_cache:/composer_cache
node: node:
image: node:14 image: node:14
restart: unless-stopped
depends_on:
- nginx
entrypoint: ["/bin/bash", "-c"] entrypoint: ["/bin/bash", "-c"]
command: command:
- | - |
...@@ -52,4 +80,10 @@ services: ...@@ -52,4 +80,10 @@ services:
- ./metager:/metager/metager_app - ./metager:/metager/metager_app
- node_modules:/metager/metager_app/node_modules - node_modules:/metager/metager_app/node_modules
- node_cache:/root/.npm - node_cache:/root/.npm
redis:
image: redis:6
restart: unless-stopped
user: "redis:redis"
healthcheck:
test: "redis-cli ping"
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment