Skip to content

Commit

Permalink
Merge pull request #15 from jburel/build
Browse files Browse the repository at this point in the history
Build
  • Loading branch information
jburel authored Dec 16, 2024
2 parents 18bccb6 + 4b58581 commit eb47378
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/omero_plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
env:
STAGE: lib
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Checkout omero-test-infra
uses: actions/checkout@master
with:
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ jobs:
name: Build and publish Python distribution to PyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Build a binary wheel and a source tarball
run: |
python -mpip install wheel
python setup.py sdist bdist_wheel
python -mpip install build
python -m build
- name: Publish distribution to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@v1.3.0
uses: pypa/gh-action-pypi-publish@v1.8.14
with:
password: ${{ secrets.PYPI_PASSWORD }}
12 changes: 8 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
FROM continuumio/miniconda3:4.7.12-alpine as builder
FROM continuumio/miniconda3:24.9.2-0 as builder

USER root

COPY . /omero-prometheus-tools/
RUN cd /omero-prometheus-tools/ && \
/opt/conda/bin/python setup.py sdist bdist_wheel
/opt/conda/bin/python -mpip install build && \
/opt/conda/bin/python -m build

######################################################################

FROM continuumio/miniconda3:4.7.12-alpine
FROM continuumio/miniconda3:24.9.2-0
# https://jcrist.github.io/conda-docker-tips.html
RUN /opt/conda/bin/conda install -y -q -c conda-forge omero-py nomkl
RUN /opt/conda/bin/pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp312-cp312-manylinux_2_28_x86_64.whl
RUN /opt/conda/bin/pip install omero-py
RUN /opt/conda/bin/conda install -y -q -c conda-forge nomkl

COPY --from=builder /omero-prometheus-tools/dist/*.whl .
RUN /opt/conda/bin/pip install *.whl
ENTRYPOINT ["/opt/conda/bin/omero-prometheus-tools.py"]

0 comments on commit eb47378

Please sign in to comment.