drop docker support
This commit is contained in:
@@ -8,7 +8,4 @@ exclude_patterns = [
|
|||||||
name = "python"
|
name = "python"
|
||||||
|
|
||||||
[analyzers.meta]
|
[analyzers.meta]
|
||||||
runtime_version = "3.x.x"
|
runtime_version = "3.x.x"
|
||||||
|
|
||||||
[[analyzers]]
|
|
||||||
name = "docker"
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
config/
|
|
||||||
__pycache__/
|
|
||||||
build/
|
|
||||||
dist/
|
|
||||||
.ruff_cache/
|
|
||||||
.env
|
|
||||||
To-Do.md
|
|
||||||
55
.github/workflows/docker.yml
vendored
55
.github/workflows/docker.yml
vendored
@@ -1,55 +0,0 @@
|
|||||||
name: Build and Publish Docker Image
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
tags: [ 'v*' ]
|
|
||||||
|
|
||||||
env:
|
|
||||||
REGISTRY: ghcr.io
|
|
||||||
IMAGE_NAME: ${{ github.repository }}
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
packages: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
|
|
||||||
|
|
||||||
- name: Log in to the Container registry
|
|
||||||
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
|
|
||||||
with:
|
|
||||||
registry: ${{ env.REGISTRY }}
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f
|
|
||||||
with:
|
|
||||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
|
||||||
tags: |
|
|
||||||
type=raw,value=latest,enable={{is_default_branch}}
|
|
||||||
type=ref,event=branch,prefix=,suffix=,enable={{is_default_branch}}
|
|
||||||
type=ref,event=pr
|
|
||||||
type=semver,pattern={{version}}
|
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
type=sha,format=short
|
|
||||||
|
|
||||||
- name: Build and push Docker image
|
|
||||||
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
file: docker/Dockerfile
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
38
Makefile
38
Makefile
@@ -1,5 +1,5 @@
|
|||||||
# Ren Browser Makefile
|
# Ren Browser Makefile
|
||||||
.PHONY: help build poetry-build linux apk docker-build docker-build-multi docker-run docker-stop docker-compose-up docker-compose-down clean test lint format
|
.PHONY: help build poetry-build linux apk clean test lint format
|
||||||
|
|
||||||
# Default target
|
# Default target
|
||||||
help:
|
help:
|
||||||
@@ -10,12 +10,6 @@ help:
|
|||||||
@echo " poetry-build - Build project with Poetry"
|
@echo " poetry-build - Build project with Poetry"
|
||||||
@echo " linux - Build Linux package"
|
@echo " linux - Build Linux package"
|
||||||
@echo " apk - Build Android APK"
|
@echo " apk - Build Android APK"
|
||||||
@echo " docker-build - Build Docker image with Buildx"
|
|
||||||
@echo " docker-build-multi - Build multi-platform Docker image"
|
|
||||||
@echo " docker-run - Run Docker container"
|
|
||||||
@echo " docker-stop - Stop Docker container"
|
|
||||||
@echo " docker-compose-up - Start production compose stack"
|
|
||||||
@echo " docker-compose-down- Stop production compose stack"
|
|
||||||
@echo " test - Run tests"
|
@echo " test - Run tests"
|
||||||
@echo " lint - Run linter"
|
@echo " lint - Run linter"
|
||||||
@echo " format - Format code"
|
@echo " format - Format code"
|
||||||
@@ -40,33 +34,6 @@ apk:
|
|||||||
@echo "Building Android APK..."
|
@echo "Building Android APK..."
|
||||||
poetry run flet build apk
|
poetry run flet build apk
|
||||||
|
|
||||||
# Docker targets
|
|
||||||
docker-build:
|
|
||||||
@echo "Building Docker image with Buildx..."
|
|
||||||
docker buildx build -t ren-browser --load -f docker/Dockerfile .
|
|
||||||
|
|
||||||
docker-build-multi:
|
|
||||||
@echo "Building multi-platform Docker image..."
|
|
||||||
docker buildx build -t ren-browser-multi --platform linux/amd64,linux/arm64 -f docker/Dockerfile --push .
|
|
||||||
|
|
||||||
docker-run:
|
|
||||||
@echo "Running Docker container..."
|
|
||||||
docker run -p 8550:8550 --name ren-browser-container ren-browser
|
|
||||||
|
|
||||||
docker-stop:
|
|
||||||
@echo "Stopping Docker container..."
|
|
||||||
docker stop ren-browser-container || true
|
|
||||||
docker rm ren-browser-container || true
|
|
||||||
|
|
||||||
# Docker Compose targets
|
|
||||||
docker-compose-up:
|
|
||||||
@echo "Starting production Docker Compose stack..."
|
|
||||||
docker-compose -f docker/compose.yml up -d
|
|
||||||
|
|
||||||
docker-compose-down:
|
|
||||||
@echo "Stopping production Docker Compose stack..."
|
|
||||||
docker-compose -f docker/compose.yml down
|
|
||||||
|
|
||||||
# Development targets
|
# Development targets
|
||||||
test:
|
test:
|
||||||
@echo "Running tests..."
|
@echo "Running tests..."
|
||||||
@@ -87,5 +54,4 @@ clean:
|
|||||||
rm -rf dist/
|
rm -rf dist/
|
||||||
rm -rf *.egg-info/
|
rm -rf *.egg-info/
|
||||||
find . -type d -name __pycache__ -exec rm -rf {} +
|
find . -type d -name __pycache__ -exec rm -rf {} +
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
docker rmi ren-browser || true
|
|
||||||
@@ -102,13 +102,6 @@ uv sync
|
|||||||
uv run ren-browser-web
|
uv run ren-browser-web
|
||||||
```
|
```
|
||||||
|
|
||||||
### Docker/Podman
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker build -t ren-browser .
|
|
||||||
docker run -p 8550:8550 -v ./config:/app/config ren-browser
|
|
||||||
```
|
|
||||||
|
|
||||||
## Building
|
## Building
|
||||||
|
|
||||||
### Linux
|
### Linux
|
||||||
|
|||||||
2
To-Do.md
2
To-Do.md
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
## Bugs
|
## Bugs
|
||||||
|
|
||||||
- [ ] Fix Docker
|
|
||||||
- [ ] Test Config Saving on Android.
|
- [ ] Test Config Saving on Android.
|
||||||
- [ ] Fix persisting app state in background on Android. https://github.com/Sudo-Ivan/Ren-Browser/issues/1
|
- [ ] Fix persisting app state in background on Android. https://github.com/Sudo-Ivan/Ren-Browser/issues/1
|
||||||
- [ ] Fix tabs dragging/reordering and overflow issues. https://github.com/Sudo-Ivan/Ren-Browser/issues/1
|
- [ ] Fix tabs dragging/reordering and overflow issues. https://github.com/Sudo-Ivan/Ren-Browser/issues/1
|
||||||
@@ -42,7 +41,6 @@
|
|||||||
|
|
||||||
## Distribution
|
## Distribution
|
||||||
|
|
||||||
- [ ] Add Docker images to build Windows, Linux, MacOS, Android, iOS.
|
|
||||||
- [ ] Add/Update build workflow to build Windows, MacOS and iOS.
|
- [ ] Add/Update build workflow to build Windows, MacOS and iOS.
|
||||||
- [ ] Appimage
|
- [ ] Appimage
|
||||||
- [ ] Flatpak
|
- [ ] Flatpak
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
ARG PYTHON_VERSION=3.13
|
|
||||||
FROM python:${PYTHON_VERSION}-alpine
|
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source="https://github.com/Sudo-Ivan/Ren-Browser"
|
|
||||||
LABEL org.opencontainers.image.description="A browser for the Reticulum Network."
|
|
||||||
LABEL org.opencontainers.image.licenses="MIT"
|
|
||||||
LABEL org.opencontainers.image.authors="Sudo-Ivan"
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
RUN apk add --no-cache gcc python3-dev musl-dev linux-headers libffi-dev openssl-dev
|
|
||||||
|
|
||||||
RUN pip install --no-cache poetry
|
|
||||||
ENV POETRY_VIRTUALENVS_IN_PROJECT=true
|
|
||||||
|
|
||||||
COPY pyproject.toml poetry.lock* ./
|
|
||||||
COPY README.md ./
|
|
||||||
COPY ren_browser ./ren_browser
|
|
||||||
|
|
||||||
RUN poetry install --no-interaction --no-ansi --no-cache
|
|
||||||
|
|
||||||
RUN chown -R 1000:1000 /app/.venv
|
|
||||||
|
|
||||||
ENV PATH="/app/.venv/bin:$PATH"
|
|
||||||
ENV FLET_WEB_PORT=8550
|
|
||||||
ENV FLET_WEB_HOST=0.0.0.0
|
|
||||||
ENV DISPLAY=:99
|
|
||||||
|
|
||||||
EXPOSE 8550
|
|
||||||
|
|
||||||
ENTRYPOINT ["poetry", "run", "ren-browser-web"]
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
services:
|
|
||||||
ren-browser:
|
|
||||||
image: ghcr.io/sudo-ivan/ren-browser:latest
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:8550:8550"
|
|
||||||
environment:
|
|
||||||
- FLET_WEB_PORT=8550
|
|
||||||
- FLET_WEB_HOST=0.0.0.0
|
|
||||||
- DISPLAY=:99
|
|
||||||
- PIP_CACHE_DIR=/tmp/pip-cache
|
|
||||||
user: "1000:1000"
|
|
||||||
security_opt:
|
|
||||||
- no-new-privileges:true
|
|
||||||
restart: unless-stopped
|
|
||||||
Reference in New Issue
Block a user