Compare commits

...

2 Commits

2 changed files with 29 additions and 23 deletions

View File

@ -6,13 +6,10 @@ WORKDIR /app
COPY package*.json ./
RUN npm i
COPY . .
ENV PUBLIC_PB_URL=http://pb:8080
ENV PUBLIC_PB_URL=http://localhost:8080
ENV PUBLIC_URL=http://localhost:4321
RUN npm run build
# Stage 2: Setup PocketBase and combine with the built app
FROM alpine:latest
ARG PB_VERSION=0.29.2
WORKDIR /pb
@ -33,15 +30,9 @@ RUN unzip /tmp/pb.zip -d /pb/
COPY api/docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
# Create app directory and copy built application
WORKDIR /app
COPY --from=app-builder /app .
# COPY --from=app-builder /app/package*.json ./
# COPY --from=app-builder /app/node_modules ./node_modules
# Set environment variables (keeping them as they are)
ENV PUBLIC_PB_URL=http://pb:8080
ENV PUBLIC_URL=http://localhost:4321
# # Set environment variables (keeping them as they are)
# ENV PUBLIC_PB_URL=http://pb:8080
# ENV PUBLIC_URL=http://localhost:4321
VOLUME [ "/pb/pb_data", "/pb/pb_migrations", "/pb/pb_hooks" ]
# VOLUME [ "/pb/pb_data" ]
@ -55,4 +46,5 @@ RUN echo '#!/bin/bash' > /usr/local/bin/start-services.sh && \
echo 'wait' >> /usr/local/bin/start-services.sh && \
chmod +x /usr/local/bin/start-services.sh
CMD ["start-services.sh"]
ENTRYPOINT ["start-services.sh"]

View File

@ -1,16 +1,30 @@
# services:
# web:
# build: .
# env_file: .env
# ports:
# - "4321:4321"
# pb:
# build: api
# env_file: .env
# volumes:
# - ./api/pb_data:/pb/pb_data
# - ./api/pb_migrations:/pb/pb_migrations
# - ./api/pb_hooks:/pb/pb_hooks
# ports:
# - "8080:8080"
services:
web:
build: .
recipie:
build:
context: .
dockerfile: Dockerfile.combined
env_file: .env
ports:
- "4321:4321"
pb:
build: api
env_file: .env
- "8080:8080" # optional, for manual pocketbase access
volumes:
- ./api/pb_data:/pb/pb_data
- ./api/pb_migrations:/pb/pb_migrations
- ./api/pb_hooks:/pb/pb_hooks
ports:
- "8080:8080"
- ./api/pb_hooks:/pb/pb_hooks