diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml index 8a4d63f..bda92a9 100644 --- a/.gitea/workflows/builder.yaml +++ b/.gitea/workflows/builder.yaml @@ -18,7 +18,15 @@ jobs: - run: dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - run: docker pull fedora:43 - run: dnf -y install git - - run: git config --global url."https://${ACTIONS_RUNTIME_TOKEN}:x-oauth-basic@codex.r10x.net/".insteadOf "${GITHUB_SERVER_URL}" + - run: > + git config + --global url."https://${ACTIONS_RUNTIME_TOKEN}:x-oauth-basic@codex.r10x.net/".insteadOf + "${GITHUB_SERVER_URL}" - run: git clone ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} ${PWD} - - run: docker build --progress=plain --tag ${IMAGE_NAME} . + - run: > + docker build + --progress=plain + --tag ${IMAGE_NAME} + --file ci/Dockerfile + . - run: docker push ${IMAGE_NAME} diff --git a/.gitea/workflows/rebuild.yml b/.gitea/workflows/rebuild.yml index 32b1f6d..b5ab56d 100644 --- a/.gitea/workflows/rebuild.yml +++ b/.gitea/workflows/rebuild.yml @@ -14,5 +14,10 @@ jobs: steps: - name: Пунь uses: https://codex.r10x.net/actions/tools@master - - run: docker build --progress=plain --tag ${IMAGE_NAME} . + - run: > + docker build + --progress=plain + --tag ${IMAGE_NAME} + --file ci/Dockerfile + . - run: docker push ${IMAGE_NAME} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index c22a9ea..0000000 --- a/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM fedora:42 AS basic - -WORKDIR /workbench - -COPY pre.sh requirements.txt docker.sh minio.sh /root/ - -RUN /root/pre.sh - -RUN /root/docker.sh - -RUN /root/minio.sh - -# Python packages -RUN pip3 install -r /root/requirements.txt