diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index 5ab2de7..dd18f4e 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -74,12 +74,12 @@ jobs: shell: bash run: | if [[ -z "${{ inputs.appsToBuild }}" ]]; then - matrices=$(python ./scripts/actions/prepare-matrices.py "all" "${{ inputs.pushImages }}" "${{ inputs.force }}") + matrices=$(python ./scripts/prepare-matrices.py "all" "${{ inputs.pushImages }}" "${{ inputs.force }}") else if [[ -z "${{ inputs.channelsToBuild }}" ]]; then - matrices=$(python ./scripts/actions/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}") + matrices=$(python ./scripts/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}") else - matrices=$(python ./scripts/actions/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}" "${{ inputs.channelsToBuild }}") + matrices=$(python ./scripts/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}" "${{ inputs.channelsToBuild }}") fi fi echo "matrices=${matrices}" >> $GITHUB_OUTPUT diff --git a/.github/workflows/render-readme.yaml b/.github/workflows/render-readme.yaml index 9ed0e2a..ce9a13d 100644 --- a/.github/workflows/render-readme.yaml +++ b/.github/workflows/render-readme.yaml @@ -43,7 +43,7 @@ jobs: env: GITHUB_TOKEN: "${{ steps.app-token.outputs.token }}" shell: bash - run: python ./scripts/actions/render-readme.py + run: python ./scripts/render-readme.py - name: Commit Changes shell: bash diff --git a/apps/boltz/Dockerfile b/apps/boltz/Dockerfile index 4b446a7..97366be 100644 --- a/apps/boltz/Dockerfile +++ b/apps/boltz/Dockerfile @@ -28,7 +28,6 @@ ENV \ USER root WORKDIR /app -# TODO: Add uv RUN \ groupadd --gid ${GID} ${USERNAME} \ && useradd --uid ${UID} --gid ${GID} --create-home --shell /bin/bash ${USERNAME} \ @@ -64,6 +63,7 @@ RUN \ && rm -rf /root/.cache /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY --chown=${UID}:${GID} ./apps/boltz/entrypoint.sh /entrypoint.sh +RUN chmod -R 755 /entrypoint.sh USER ${USERNAME} WORKDIR /cache @@ -72,4 +72,6 @@ VOLUME ["/cache"] WORKDIR /data VOLUME ["/data"] +WORKDIR /app + ENTRYPOINT ["/usr/bin/catatonit", "--", "/entrypoint.sh"] diff --git a/apps/boltz/README.md b/apps/boltz/README.md index 1d98c38..d3dc645 100644 --- a/apps/boltz/README.md +++ b/apps/boltz/README.md @@ -14,10 +14,9 @@ You can configure the docker image using the below environment variables | Environment Variable | CLI Flag | Type | Default Value | Description | | ---------------------- | ------------------------ | -------------------- | --------------------------- | ------------------------------------------------------------------- | -| `SHELL` | N/A | `FLAG` | `False` | Start docker container as a shell | | `USERNAME` | N/A | `STR` | `rare` | Username for the container | -| `UID` | N/A | `INTEGER` | `900` | UID to use for the container | -| `GID` | N/A | `INTEGER` | `900` | GID to use for the container | +| `UID` | N/A | `INTEGER` | `900` | UID for the container | +| `GID` | N/A | `INTEGER` | `900` | GID for the container | | `DATA_PATH` | `--out_dir` | `PATH` | `/data` | The path where predictions will be saved. | | `CACHE_PATH` | `--cache` | `PATH` | `/cache` | The directory for downloading data and models. | | `DEVICE_TYPE` | `--accelerator` | `[gpu, cpu, tpu]` | `gpu` | The type of accelerator to use for predictions. | diff --git a/scripts/actions/prepare-matrices.py b/scripts/prepare-matrices.py similarity index 100% rename from scripts/actions/prepare-matrices.py rename to scripts/prepare-matrices.py diff --git a/scripts/actions/render-readme.py b/scripts/render-readme.py similarity index 100% rename from scripts/actions/render-readme.py rename to scripts/render-readme.py diff --git a/scripts/wip.sh b/scripts/wip.sh index b254c83..ca444f0 100755 --- a/scripts/wip.sh +++ b/scripts/wip.sh @@ -23,7 +23,7 @@ function git_current_branch { function gwip { git add -A git rm $(git ls-files --deleted) 2> /dev/null - git commit --no-gpg-sign -m "--wip-- [skipci]" + git commit --no-gpg-sign -m "--wip--" } function gunwip {