Relocate docker/server files to continuous_integration

dask-contrib · Jan 8, 2024 · 0eeb338 · 0eeb338
1 parent 88ccaaa
commit 0eeb338
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -11,7 +11,7 @@ on:
       - Cargo.toml
       - Cargo.lock
       - pyproject.toml
-      - docker/**
+      - continuous_integration/docker/**
       - .github/workflows/docker.yml
 
 # When this workflow is queued, automatically cancel any previous running
@@ -47,7 +47,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./docker/main.dockerfile
+          file: ./continuous_integration/docker/main.dockerfile
           build-args: DOCKER_META_VERSION=${{ steps.docker_meta_main.outputs.version }}
           platforms: ${{ matrix.platform }}
           tags: ${{ steps.docker_meta_main.outputs.tags }}
@@ -68,7 +68,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./docker/cloud.dockerfile
+          file: ./continuous_integration/docker/cloud.dockerfile
           build-args: DOCKER_META_VERSION=${{ steps.docker_meta_main.outputs.version }}
           platforms: ${{ matrix.platform }}
           tags: ${{ steps.docker_meta_cloud.outputs.tags }}

diff --git a/docker/cloud.dockerfile → ...nuous_integration/docker/cloud.dockerfile b/docker/cloud.dockerfile → ...nuous_integration/docker/cloud.dockerfile
diff --git a/docker/conda.txt → continuous_integration/docker/conda.txt b/docker/conda.txt → continuous_integration/docker/conda.txt
diff --git a/docker/main.dockerfile → ...inuous_integration/docker/main.dockerfile b/docker/main.dockerfile → ...inuous_integration/docker/main.dockerfile
@@ -11,7 +11,7 @@ RUN sh /rustup-init.sh -y --default-toolchain=stable --profile=minimal \
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 # Install conda dependencies for dask-sql
-COPY docker/conda.txt /opt/dask_sql/
+COPY continuous_integration/docker/conda.txt /opt/dask_sql/
 RUN mamba install -y \
     # build requirements
     "maturin>=1.3,<1.4" \
@@ -44,7 +44,7 @@ RUN cd /opt/dask_sql/ \
     && CONDA_PREFIX="/opt/conda/" maturin develop
 
 # Set the script to execute
-COPY scripts/startup_script.py /opt/dask_sql/startup_script.py
+COPY continuous_integration/scripts/startup_script.py /opt/dask_sql/startup_script.py
 
 EXPOSE 8080
 ENTRYPOINT [ "/usr/bin/prepare.sh", "/opt/conda/bin/python", "/opt/dask_sql/startup_script.py" ]
diff --git a/scripts/startup_script.py → ...ous_integration/scripts/startup_script.py b/scripts/startup_script.py → ...ous_integration/scripts/startup_script.py
diff --git a/docs/source/server.rst b/docs/source/server.rst
@@ -121,7 +121,7 @@ To run a standalone SQL server in your ``dask`` cluster, follow these three step
 
         FROM nbraun/dask-sql
 
-        COPY startup_script.py /opt/dask_sql/startup_script.py
+        COPY continuous_integration/docker/startup_script.py /opt/dask_sql/startup_script.py
 
         ENTRYPOINT [ "/opt/conda/bin/python", "/opt/dask_sql/startup_script.py" ]