diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index b7aac2dd..00000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Docker Build - -on: - push: - pull_request: - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - - name: Start JupyterHub - run: | - jupyterhub -f jupyterhub_config.py & - docker compose build - docker compose up -d - # Give some time to start - sleep 10 - docker compose logs - - working-directory: docker - - - name: Build JHub Image - run: | - docker build -t jhub -f Dockerfile.jhub . - sleep 5 - working-directory: docker diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cc6a396a..ea4307bc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,6 @@ name: Lint on: - push: pull_request: jobs: diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index b14b2a26..38ab58e9 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -1,7 +1,6 @@ name: Test Integration on: - push: pull_request: jobs: diff --git a/jhub_apps/__about__.py b/jhub_apps/__about__.py index 798e436d..f596b276 100644 --- a/jhub_apps/__about__.py +++ b/jhub_apps/__about__.py @@ -1 +1 @@ -__version__ = "2024.4.1rc5" +__version__ = "2024.4.1rc6" diff --git a/jhub_apps/service/routes.py b/jhub_apps/service/routes.py index 10780e38..e943b480 100644 --- a/jhub_apps/service/routes.py +++ b/jhub_apps/service/routes.py @@ -163,7 +163,9 @@ async def create_server( thumbnail: typing.Optional[UploadFile] = File(None), user: User = Depends(get_current_user), ): - logger.info("Creating server", server_name=server.servername, user=user.name) + # server.servername is not necessary to supply for create server + server_name = server.user_options.display_name + logger.info("Creating server", server_name=server_name, user=user.name) server.user_options.thumbnail = await get_thumbnail_data_url( framework_name=server.user_options.framework, thumbnail=thumbnail )