Skip to content
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
push:
branches:
- main
pull_request:
paths:
- "docker/**"

# When this workflow is queued, automatically cancel any previous running
# or pending jobs from the same branch
Expand All @@ -26,6 +29,10 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
if: |
github.event_name == 'push'
&& github.ref == 'refs/heads/main'
&& github.repository == 'dask-contrib/dask-sql'
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -44,7 +51,8 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/386
tags: ${{ steps.docker_meta_main.outputs.tags }}
labels: ${{ steps.docker_meta_main.outputs.labels }}
push: true
push: ${{ github.ref == 'refs/head/main' && github.repository == 'dask-contrib/dask-sql' }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
push: ${{ github.ref == 'refs/head/main' && github.repository == 'dask-contrib/dask-sql' }}
push: ${{ env.DOCKER_PUSH }}

load: true
- name: Docker meta for cloud image
id: docker_meta_cloud
uses: crazy-max/ghaction-docker-meta@v1
Expand All @@ -59,4 +67,4 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/386
tags: ${{ steps.docker_meta_cloud.outputs.tags }}
labels: ${{ steps.docker_meta_cloud.outputs.labels }}
push: true
push: ${{ github.ref == 'refs/head/main' && github.repository == 'dask-contrib/dask-sql' }}
4 changes: 2 additions & 2 deletions docker/cloud.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ ARG DOCKER_META_VERSION
FROM nbraun/dask-sql:${DOCKER_META_VERSION}

RUN conda config --add channels conda-forge \
&& /opt/conda/bin/conda install --freeze-installed \
&& /opt/conda/bin/mamba install --freeze-installed \
"s3fs" \
"dask-cloudprovider" \
"dask-cloudprovider" -y \
&& pip install awscli \
&& conda clean -ay

Expand Down
4 changes: 2 additions & 2 deletions docker/main.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL author "Nils Braun <[email protected]>"
# Install dependencies for dask-sql
COPY docker/conda.txt /opt/dask_sql/
RUN conda config --add channels conda-forge \
&& /opt/conda/bin/conda install --freeze-installed \
&& /opt/conda/bin/mamba install --freeze-installed \
"jpype1>=1.0.2" \
"openjdk>=11" \
"maven>=3.6.0" \
Expand All @@ -18,7 +18,7 @@ RUN conda config --add channels conda-forge \
"pygments>=2.7.1" \
"dask-ml>=2022.1.22" \
"scikit-learn>=1.0.0" \
"intake>=0.6.0" \
"intake>=0.6.0" -y \
&& conda clean -ay

# install dask-sql
Expand Down