GuanM/tabby-web
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby-web.git synced 2025-06-07 21:19:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker: fixed missing app-dist from the image build

Browse Source
This commit is contained in:
Eugene Pankov 2022-11-07 22:33:51 +01:00
parent c70ed34482
commit 235ba2497c
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -39,10 +39,11 @@ COPY --from=frontend /app/build /frontend
ARG BUNDLED_TABBY=1.0.187-nightly.1 ARG BUNDLED_TABBY=1.0.187-nightly.1
RUN FRONTEND_BUILD_DIR=/frontend /venv/*/bin/python ./manage.py collectstatic --noinput RUN FRONTEND_BUILD_DIR=/frontend /venv/*/bin/python ./manage.py collectstatic --noinput
RUN FRONTEND_BUILD_DIR=/frontend /venv/*/bin/python ./manage.py add_version ${BUNDLED_TABBY} RUN APP_DIST_STORAGE=file:///app-dist /venv/*/bin/python ./manage.py add_version ${BUNDLED_TABBY}
FROM python:3.7-alpine AS backend FROM python:3.7-alpine AS backend
ENV APP_DIST_STORAGE file:///app-dist
ENV DOCKERIZE_VERSION v0.6.1 ENV DOCKERIZE_VERSION v0.6.1
ENV DOCKERIZE_ARCH amd64 ENV DOCKERIZE_ARCH amd64
ARG TARGETPLATFORM ARG TARGETPLATFORM
@ -57,6 +58,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
RUN apk add mariadb-connector-c RUN apk add mariadb-connector-c
COPY --from=build-backend /app /app COPY --from=build-backend /app /app
COPY --from=build-backend /app-dist /app-dist
COPY --from=build-backend /venv /venv COPY --from=build-backend /venv /venv
COPY backend/start.sh backend/manage.sh / COPY backend/start.sh backend/manage.sh /

4
docker-compose.yml
View File

@ -6,14 +6,12 @@ services:
- db - db
ports: ports:
- 9090:80 - 9090:80
volumes:
- ./app-dist:/app-dist
environment: environment:
- DATABASE_URL=mysql://root:123@db/tabby - DATABASE_URL=mysql://root:123@db/tabby
- PORT=80 - PORT=80
- DEBUG=False - DEBUG=False
- APP_DIST_STORAGE=file:///app-dist
- DOCKERIZE_ARGS="-wait tcp://db:3306 -timeout 60s" - DOCKERIZE_ARGS="-wait tcp://db:3306 -timeout 60s"
# - APP_DIST_STORAGE="file:///app-dist"
db: db:
image: mariadb:10.7.1 image: mariadb:10.7.1