Skip to content

Commit

Permalink
Fixes Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
butschster committed Apr 21, 2024
1 parent d707f89 commit ad640ff
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
8 changes: 7 additions & 1 deletion .docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
ARG ROAD_RUNNER_IMAGE=2023.3.7
ARG CENTRIFUGO_IMAGE=v4

# Clone the project
FROM alpine/git as git

ARG REPOSITORY=https://github.com/buggregator/buggregator.dev
RUN git clone $REPOSITORY /app

# Build rr binary
FROM ghcr.io/roadrunner-server/roadrunner:$ROAD_RUNNER_IMAGE as rr

# Configure PHP project
FROM ghcr.io/buggregator/docker:latest as backend

COPY ./app /app
COPY --from=git /app/app /app
COPY --from=rr /usr/bin/rr /app

ARG APP_VERSION=v1.0
Expand Down
8 changes: 7 additions & 1 deletion .docker/spa/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Clone the project
FROM alpine/git as git

ARG REPOSITORY=https://github.com/buggregator/buggregator.dev
RUN git clone $REPOSITORY /app

FROM node:21-alpine

ARG APP_VERSION=1.0.0
ENV APP_VERSION=$APP_VERSION

COPY ./spa /app
COPY --from=git /app/spa /app

WORKDIR /app

Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ services:
NUXT_PUBLIC_API_URL: https://buggregator.localhost
NUXT_PUBLIC_WS_URL: ws:https://buggregator.localhost/connection/websocket
NUXT_PUBLIC_EXAMPLES_URL: https://buggregator.localhost
# volumes:
# - ./spa:/app
networks:
- buggregator-network

Expand Down Expand Up @@ -95,7 +93,7 @@ services:
DB_DATABASE: examples
DB_USERNAME: homestead
DB_PASSWORD: secret
APP_URL: ${APP_URL:-https://examples.buggregator.localhost}
APP_URL: ${APP_URL:-https://buggregator.localhost}
MAIL_HOST: buggregator-demo
MAIL_PORT: 1025
MAIL_ENCRYPTION: null
Expand Down

0 comments on commit ad640ff

Please sign in to comment.