Skip to content

Commit

Permalink
Merge pull request #56 from bento-platform/chore/update-deps
Browse files Browse the repository at this point in the history
chore: update dependencies
  • Loading branch information
davidlougheed authored Oct 27, 2023
2 parents 914b6c2 + aefbfe5 commit 2117bcf
Show file tree
Hide file tree
Showing 6 changed files with 607 additions and 586 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Bento build action
uses: bento-platform/[email protected].0
uses: bento-platform/[email protected].1
with:
registry: ghcr.io
registry-username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
name: Set up Python
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
name: Set up Python
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
run: python -m pip install poetry==1.3.2
run: python -m pip install poetry==1.6.1
- name: Install dependencies
run: python -m poetry install
- name: Test
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.08.30 AS base-deps
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.10.20 AS base-deps

SHELL ["/bin/bash", "-c"]

Expand All @@ -8,10 +8,10 @@ SHELL ["/bin/bash", "-c"]
RUN apt-get update -y && \
apt-get install -y samtools tabix bcftools curl jq openjdk-17-jre && \
rm -rf /var/lib/apt/lists/* && \
pip install --no-cache-dir gunicorn==21.2.0 "pysam>=0.21.0,<0.22.0"
pip install --no-cache-dir gunicorn==21.2.0 "pysam>=0.22.0,<0.23.0"

WORKDIR /
ENV CROMWELL_VERSION=85
ENV CROMWELL_VERSION=86
RUN curl -L \
https://github.com/broadinstitute/cromwell/releases/download/${CROMWELL_VERSION}/cromwell-${CROMWELL_VERSION}.jar \
-o cromwell.jar
Expand Down
6 changes: 3 additions & 3 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.08.30 AS base-deps
FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.10.20 AS base-deps

LABEL org.opencontainers.image.description="Local development image for Bento WES."
LABEL devcontainer.metadata='[{ \
Expand All @@ -19,10 +19,10 @@ SHELL ["/bin/bash", "-c"]
RUN apt-get update -y && \
apt-get install -y samtools tabix bcftools curl jq openjdk-17-jre && \
rm -rf /var/lib/apt/lists/* && \
pip install --no-cache-dir gunicorn==21.2.0 "pysam>=0.21.0,<0.22.0"
pip install --no-cache-dir gunicorn==21.2.0 "pysam>=0.22.0,<0.23.0"

WORKDIR /
ENV CROMWELL_VERSION=85
ENV CROMWELL_VERSION=86
RUN curl -L \
https://github.com/broadinstitute/cromwell/releases/download/${CROMWELL_VERSION}/cromwell-${CROMWELL_VERSION}.jar \
-o cromwell.jar
Expand Down
Loading

0 comments on commit 2117bcf

Please sign in to comment.