image per container
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
2318850832
commit
c2856bd2c0
43
.drone.yml
43
.drone.yml
|
@ -19,10 +19,46 @@ steps:
|
||||||
- name: host_docker_sock
|
- name: host_docker_sock
|
||||||
path: /var/run/docker.sock
|
path: /var/run/docker.sock
|
||||||
|
|
||||||
- name: build-docker-image
|
- name: build-php-image
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
dockerfile: docker/Dockerfile.drone
|
dockerfile: docker/Dockerfile.php
|
||||||
|
auto_tag: true
|
||||||
|
repo: registry.xrg.io/xrg.es
|
||||||
|
registry: https://registry.xrg.io
|
||||||
|
username:
|
||||||
|
from_secret: registry_username
|
||||||
|
password:
|
||||||
|
from_secret: registry_password
|
||||||
|
volumes:
|
||||||
|
- name: host_docker_sock
|
||||||
|
path: /var/run/docker.sock
|
||||||
|
depends_on:
|
||||||
|
- frontend
|
||||||
|
- backend
|
||||||
|
|
||||||
|
- name: build-nginx-image
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: docker/Dockerfile.nginx
|
||||||
|
auto_tag: true
|
||||||
|
repo: registry.xrg.io/xrg.es
|
||||||
|
registry: https://registry.xrg.io
|
||||||
|
username:
|
||||||
|
from_secret: registry_username
|
||||||
|
password:
|
||||||
|
from_secret: registry_password
|
||||||
|
volumes:
|
||||||
|
- name: host_docker_sock
|
||||||
|
path: /var/run/docker.sock
|
||||||
|
depends_on:
|
||||||
|
- frontend
|
||||||
|
- backend
|
||||||
|
|
||||||
|
- name: build-redis-image
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: docker/Dockerfile.redis
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
repo: registry.xrg.io/xrg.es
|
repo: registry.xrg.io/xrg.es
|
||||||
registry: https://registry.xrg.io
|
registry: https://registry.xrg.io
|
||||||
|
@ -36,9 +72,6 @@ steps:
|
||||||
depends_on:
|
depends_on:
|
||||||
- frontend
|
- frontend
|
||||||
- backend
|
- backend
|
||||||
#when:
|
|
||||||
# event:
|
|
||||||
# - tag
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: host_docker_sock
|
- name: host_docker_sock
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
FROM nginx:latest
|
||||||
|
|
||||||
|
COPY docker/zz-default-nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
|
COPY frontend/build /var/www/frontend
|
|
@ -21,5 +21,4 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||||
COPY docker/zz-custom-php.ini "$PHP_INI_DIR/conf.d/"
|
COPY docker/zz-custom-php.ini "$PHP_INI_DIR/conf.d/"
|
||||||
COPY docker/zz-custom-phpfpm.conf /usr/local/etc/php-fpm.d/zz-docker.conf
|
COPY docker/zz-custom-phpfpm.conf /usr/local/etc/php-fpm.d/zz-docker.conf
|
||||||
|
|
||||||
COPY frontend/build /var/www/frontend
|
|
||||||
COPY backend /var/www/backend
|
COPY backend /var/www/backend
|
|
@ -0,0 +1,3 @@
|
||||||
|
FROM redis:latest
|
||||||
|
|
||||||
|
COPY docker/redis.conf /usr/local/etc/redis/redis.conf
|
|
@ -2,28 +2,22 @@ version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
xrges-nginx:
|
xrges-nginx:
|
||||||
image: nginx:latest
|
image: registry.xrg.io/xrg.es/nginx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "8086:80"
|
- "8086:80"
|
||||||
volumes:
|
|
||||||
- ../frontend/build:/var/www/frontend
|
|
||||||
- ./zz-default-nginx.conf:/etc/nginx/conf.d/default.conf
|
|
||||||
links:
|
links:
|
||||||
- xrges-php
|
- xrges-php
|
||||||
|
|
||||||
xrges-php:
|
xrges-php:
|
||||||
build: .
|
image: registry.xrg.io/xrg.es/php:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
|
||||||
- ../backend:/var/www/backend
|
|
||||||
|
|
||||||
xrges-redis:
|
xrges-redis:
|
||||||
image: redis:latest
|
image: registry.xrg.io/xrg.es/redis:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ../home/redis:/data
|
- ./redis:/data
|
||||||
- ./redis.conf:/usr/local/etc/redis/redis.conf
|
|
||||||
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
|
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
Loading…
Reference in New Issue