breadone/Recipie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OOH that's closer

Browse Source
This commit is contained in:
June
2025-08-13 20:42:08 +12:00
parent 82c9c5b826
commit ee9cb8972a
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile.combined
View File

@@ -10,9 +10,6 @@ ENV PUBLIC_PB_URL=http://pb: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"]