Merge pull request #1 from javeoff/main

Add Makefile with Docker container management commands

Author: GhostTypes

.github/workflows/docker-publish.yml

@@ -0,0 +1,56 @@
+name: Docker Publish
+
+on:
+  
+  workflow_run:
+    workflows: ["Release"]
+    types:
+      - completed
+    branches:
+      - main
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GH_TOKEN=${{ secrets.GH_TOKEN }}
+

.github/workflows/release.yml

@@ -0,0 +1,35 @@
+name: Release
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write       # for commenting on issues
+      pull-requests: write # for commenting on PRs
+      id-token: write    # for authentication
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+          
+      - name: Install dependencies
+        run: npm i
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: npm run release

.gitignore

@@ -0,0 +1 @@
+.aider*

.releaserc

@@ -0,0 +1,14 @@
+{
+    "branches": ["main"],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      "@semantic-release/github",
+      ["@semantic-release/git", {
+        "assets": ["package.json", "CHANGELOG.md"],
+        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+      }]
+    ]
+}
+

CHANGELOG.md

@@ -0,0 +1,14 @@
+# [1.1.0](https://github.com/javeoff/cloudscraper-server/compare/v1.0.0...v1.1.0) (2025-02-08)
+
+
+### Features
+
+* **docker:** add docker-compose file to simplify application deployment and configuration ([bb79d1a](https://github.com/javeoff/cloudscraper-server/commit/bb79d1ad109078c9ac7198a758006161bed8717b))
+
+# 1.0.0 (2025-02-08)
+
+
+### Features
+
+* Add Makefile with Docker container management commands ([1557166](https://github.com/javeoff/cloudscraper-server/commit/155716643e15ba2ab16ed84d7fbe97941444f6d8))
+* **workflows:** add Docker Publish and Release workflows for automated image building and deployment ([112a293](https://github.com/javeoff/cloudscraper-server/commit/112a2939eed6c8bc1a18d07f3dbd43fcaa99354a))

Dockerfile

@@ -0,0 +1,21 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+# Install system dependencies
+# RUN apt-get update && apt-get install -y \
+    # gcc \
+    # && rm -rf /var/lib/apt/lists/*
+
+# Copy requirements first to leverage Docker cache
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY server.py .
+
+# Expose the port the app runs on
+EXPOSE 5000
+
+# Command to run the application
+CMD ["python", "server.py"]

Makefile

@@ -0,0 +1,33 @@
+.PHONY: build run clean logs test
+
+# Переменные
+IMAGE_NAME = proxy-server
+CONTAINER_NAME = proxy-server
+PORT = 5000
+
+# Сборка Docker образа
+build:
+	docker build -t $(IMAGE_NAME) .
+
+# Запуск контейнера
+run:
+	docker run -d --name $(CONTAINER_NAME) -p $(PORT):$(PORT) $(IMAGE_NAME)
+
+# Остановка и удаление контейнера
+clean:
+	docker stop $(CONTAINER_NAME) || true
+	docker rm $(CONTAINER_NAME) || true
+
+# Просмотр логов
+logs:
+	docker logs -f $(CONTAINER_NAME)
+
+# Перезапуск контейнера
+restart: clean run
+
+# Сборка и запуск
+up: build run
+
+# Проверка статуса контейнера
+status:
+	docker ps -a | grep $(CONTAINER_NAME)

README.md

@@ -35,3 +35,31 @@ if __name__ == "__main__":
     serve(app, host="0.0.0.0", port=5000) # change the port here
 ```
 Feel free to configure flask or other options to suite your needs
+
+## Using Make Commands
+The project includes several Make commands to help manage the Docker container:
+
+```bash
+# Build the Docker image
+make build
+
+# Run the container
+make run 
+
+# Build and run in one command
+make up
+
+# Stop and remove the container
+make clean
+
+# View container logs
+make logs
+
+# Restart the container 
+make restart
+
+# Check container status
+make status
+```
+
+You can change the port and container settings by editing the variables at the top of the Makefile.

docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  app:
+    image: ghcr.io/GhostTypes/cloudscraper-server:main
+    ports:
+      - 5000:5000

package.json

@@ -0,0 +1,19 @@
+{
+  "name": "cs",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "release": "semantic-release"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^13.0.0",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^9.2.6",
+    "@semantic-release/release-notes-generator": "^14.0.1"
+  }
+}