Skip to content

Commit

Permalink
Fixing dockerfile (again) and push docker.
Browse files Browse the repository at this point in the history
  • Loading branch information
damienbfs committed Jun 19, 2024
1 parent 8b4075c commit febf9bc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 17 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/push_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ on:
push:
branches:
- develop
tags:
- v**
release:
types:
- published

jobs:
docker:
Expand All @@ -30,7 +31,7 @@ jobs:
tags: |
type=sha
type=semver, pattern={{version}}
latest, enable={{ github.ref_type == "release" }}
type=raw,value=latest,enable=${{ github.event_name == 'release' }}
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/push_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: create dist
- name: Create dist and publish package
run: |
cd client
python -m build
- name: Publish package
run: |
twine upload dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
python setup.py sdist
twine upload dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
1 change: 0 additions & 1 deletion .github/workflows/push_readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- develop
- release/**
release:
types:
- published
Expand Down
8 changes: 0 additions & 8 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@ RUN pip install --no-cache-dir --upgrade -r requirements.txt
WORKDIR /code

FROM lomas_server_base AS lomas_server
# Switch to non-root user
USER 1000
COPY ./lomas_server/ /code/
COPY ./LICENSE /code/LICENSE
COPY ./data/ /data/
CMD ["python", "uvicorn_serve.py"]

FROM lomas_server_base AS lomas_server_dev
# Switch to non-root user
USER 1000
ENV PYTHONDONTWRITEBYTECODE 1
CMD ["python", "uvicorn_serve.py"]

Expand All @@ -26,15 +22,11 @@ COPY ./requirements_streamlit.txt /requirements_streamlit.txt
RUN pip install --no-cache-dir --upgrade -r /requirements_streamlit.txt

FROM lomas_admin_dashboard_base AS lomas_admin_dashboard
# Switch to non-root user
USER 1000
COPY ./lomas_server/ /code/
COPY ./LICENSE /code/LICENSE
COPY ./data/ /data/
CMD ["streamlit", "run", "administration/dashboard/about.py"]

FROM lomas_admin_dashboard_base AS lomas_admin_dashboard_dev
# Switch to non-root user
USER 1000
ENV PYTHONDONTWRITEBYTECODE 1
CMD ["streamlit", "run", "administration/dashboard/about.py"]

0 comments on commit febf9bc

Please sign in to comment.