From 192c90f0086919f3039da7b3a4bb820dc8137f44 Mon Sep 17 00:00:00 2001 From: Opnxng Date: Sun, 3 Mar 2024 09:54:12 +0800 Subject: [PATCH] Removed temporary workarounds --- .gitea/workflows/rat-aint-tieba.yaml | 2 -- .gitea/workflows/wolfree.yaml | 3 --- dockerfiles/rat-aint-tieba.Dockerfile | 23 ----------------------- 3 files changed, 28 deletions(-) delete mode 100644 dockerfiles/rat-aint-tieba.Dockerfile diff --git a/.gitea/workflows/rat-aint-tieba.yaml b/.gitea/workflows/rat-aint-tieba.yaml index 9b5527b..1a65ba5 100644 --- a/.gitea/workflows/rat-aint-tieba.yaml +++ b/.gitea/workflows/rat-aint-tieba.yaml @@ -46,8 +46,6 @@ jobs: cd temp git clone ${REMOTE_REPO} . git checkout no-masters # Use no-masters branch - # Workaround to fix Docker build - curl -JL https://git.opnxng.com/opnxng/docker-images/raw/branch/main/dockerfiles/rat-aint-tieba.Dockerfile -o Dockerfile docker-buildx build \ --platform ${BUILD_PLATFORM} \ -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \ diff --git a/.gitea/workflows/wolfree.yaml b/.gitea/workflows/wolfree.yaml index 600dcee..d961da5 100644 --- a/.gitea/workflows/wolfree.yaml +++ b/.gitea/workflows/wolfree.yaml @@ -45,9 +45,6 @@ jobs: mkdir temp cd temp git clone ${REMOTE_REPO} . - # Temp workaround to upgrade to Docusaurus 3 - git fetch origin pull/4/head:temp - git checkout temp sed -i '/^RUN PATH="$HOME\/.cargo\/bin:$PATH" cargo run --manifest-path \.\/rust\/wolfree_libredirect_patch\/Cargo\.toml -- ;$/s/^#//' Dockerfile # Make Libredirect-compatible docker-buildx build \ --platform ${BUILD_PLATFORM} \ diff --git a/dockerfiles/rat-aint-tieba.Dockerfile b/dockerfiles/rat-aint-tieba.Dockerfile deleted file mode 100644 index 59e8c45..0000000 --- a/dockerfiles/rat-aint-tieba.Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# Use the official Python image as the base image -FROM python:3.11-slim - -# Install the patch utility -RUN apt-get update && apt-get install -y patch - -# Set the working directory to /app -WORKDIR /app - -# Copy the local requirements.txt file to the container -COPY requirements.txt . - -# Install the Python dependencies -RUN pip install -r requirements.txt - -# Expose port 8886 -EXPOSE 8886 - -# Copy the local code to the container -COPY . . - -# Run the Python script with Uvicorn, binding to all available network interfaces -CMD ["gunicorn", "app:proxified", "--max-requests", "50", "--worker-class", "uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:8886"]