diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index ae068cd0680e0..4bef6d8409ca2 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -117,23 +117,6 @@ jobs: with: repository: ${{ github.event_name == 'schedule' && 'mlflow/mlflow' || github.event.inputs.repository }} ref: ${{ github.event.inputs.ref }} - - name: Check diff - id: check-diff - if: github.event_name == 'pull_request' - run: | - REPO="${{ github.repository }}" - PR_NUMBER="${{ github.event.pull_request.number }}" - CHANGED_FILES=$(python dev/list_changed_files.py --repository $REPO --pr-num $PR_NUMBER | grep "Dockerfile\|\.dockerignore" || true); - DOCKER_CHANGED=$([[ ! -z "$CHANGED_FILES" ]] && echo "true" || echo "false") - echo -e "CHANGED_FILES:\nCHANGED_FILES" - echo "DOCKER_CHANGED: $DOCKER_CHANGED" - echo "docker_changed=$DOCKER_CHANGED" >> $GITHUB_OUTPUT - - - name: Run docker tests - if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || steps.check-diff.outputs.docker_changed == 'true' }} - run: | - docker build -t mlflow_test_build . && docker images | grep mlflow_test_build - - name: Show disk usage run: | df -h diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 287a67fe69ae7..0000000000000 --- a/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM python:3.10-bullseye - -WORKDIR /home/mlflow - -RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y --no-install-recommends nodejs \ - # java - openjdk-11-jre-headless \ - # yarn - && npm install --global yarn \ - # protoc - && wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip -O /tmp/protoc.zip \ - && mkdir -p /home/mlflow/.local \ - && unzip /tmp/protoc.zip -d /home/mlflow/.local/protoc \ - && rm /tmp/protoc.zip \ - && chmod -R +x /home/mlflow/.local/protoc \ - # adding an unprivileged user - && groupadd --gid 10001 mlflow \ - && useradd --uid 10001 --gid mlflow --shell /bin/bash --create-home mlflow - -ENV PATH="/home/mlflow/.local/protoc/bin:$PATH" - -# the "mlflow" user created above, represented numerically for optimal compatibility with Kubernetes security policies -USER 10001 - -CMD ["bash"] diff --git a/mlflow/R/mlflow/Dockerfile.dev b/mlflow/R/mlflow/Dockerfile.dev index d673f73f4741f..7d7de1a6408c0 100644 --- a/mlflow/R/mlflow/Dockerfile.dev +++ b/mlflow/R/mlflow/Dockerfile.dev @@ -1,9 +1,8 @@ -# Our internal Jenkins job can't build an image from rocker/r-ver:>=4.2.2 (which is based on Ubuntu 22.04). -FROM rocker/r-ver:4.2.1 +FROM rocker/r-ver:4.4.2 WORKDIR /mlflow/mlflow/R/mlflow RUN apt-get update -y -RUN apt-get install lsb-release git wget libxml2-dev libgit2-dev -y +RUN apt-get install lsb-release git wget libxml2-dev libgit2-dev libcurl4-openssl-dev libuv1 -y # Install miniforge RUN wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O ~/miniforge.sh diff --git a/tests/server/auth/test_auth.py b/tests/server/auth/test_auth.py index 618dd828433e0..f894c84a5e00f 100644 --- a/tests/server/auth/test_auth.py +++ b/tests/server/auth/test_auth.py @@ -363,15 +363,15 @@ def test_create_and_delete_registered_model(client, monkeypatch): assert rm.name == "test_model" -def _wait(url: str): +def _wait(url: str, timeout: int = 10) -> None: t = time.time() - while time.time() - t < 5: + while time.time() - t < timeout: try: if requests.get(f"{url}/health").ok: - yield + return except requests.exceptions.ConnectionError: pass - time.sleep(1) + time.sleep(0.5) pytest.fail("Server did not start") @@ -412,8 +412,7 @@ def test_proxy_log_artifacts(monkeypatch, tmp_path): ) as prc: try: url = f"http://{host}:{port}" - for _ in _wait(url): - break + _wait(url) mlflow.set_tracking_uri(url) client = MlflowClient(url)