From f0565ec9a40c2a452cc76c70e990b7c43a441e3e Mon Sep 17 00:00:00 2001 From: butschster Date: Wed, 31 May 2023 11:18:47 +0400 Subject: [PATCH] Fix --- docker-compose.yaml | 35 ++++++----------------------------- docker/php/Dockerfile | 2 +- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5ddeaf0..4a7626b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,23 +2,16 @@ version: "3.7" services: frontend: - build: - dockerfile: ./docker/npm/Dockerfile + image: ghcr.io/spiral/ticket-booking-frontend:latest ports: - "3000:3000" depends_on: - web centrifugo-rpc: - build: - dockerfile: ./docker/php/Dockerfile - args: - SERVICE_NAME: centrifugo + image: ghcr.io/spiral/ticket-booking-centrifugo:latest env_file: - .env - volumes: - - ./centrifugo:/var/www/ - - ./shared:/var/shared/\ depends_on: - collector - redis @@ -26,20 +19,13 @@ services: restart: on-failure web: - build: - dockerfile: ./docker/php/Dockerfile - args: - SERVICE_NAME: web + image: ghcr.io/spiral/ticket-booking-web:latest env_file: - .env environment: DB_DATABASE: homestead ports: - "8080:8080" - volumes: - - ./web:/var/www/ - - ./proto:/var/www/proto/ - - ./shared:/var/shared/ depends_on: - collector - redis @@ -51,10 +37,7 @@ services: restart: on-failure users: - build: - dockerfile: ./docker/php/Dockerfile - args: - SERVICE_NAME: users + image: ghcr.io/spiral/ticket-booking-users:latest env_file: - .env environment: @@ -72,10 +55,7 @@ services: restart: on-failure payment: - build: - dockerfile: ./docker/php/Dockerfile - args: - SERVICE_NAME: payment + image: ghcr.io/spiral/ticket-booking-payment:latest env_file: - .env environment: @@ -91,10 +71,7 @@ services: restart: on-failure cinema: - build: - dockerfile: ./docker/php/Dockerfile - args: - SERVICE_NAME: cinema + image: ghcr.io/spiral/ticket-booking-cinema:latest env_file: - .env environment: diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index d425368..1918972 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -34,7 +34,7 @@ COPY --from=git /app/proto /app/proto WORKDIR /app/$SERVICE_NAME RUN composer config --no-plugins allow-plugins.spiral/composer-publish-plugin false -RUN composer install --no-dev +RUN composer install LABEL org.opencontainers.image.source=$REPOSITORY LABEL org.opencontainers.image.description="Ticket booking $SERVICE_NAME"