Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-buster
FROM python:3.9-trixie
WORKDIR /opt/proxstar
RUN apt-get update -y && apt-get install -y python3-dev libldap2-dev libsasl2-dev ldap-utils git
COPY requirements.txt .
Expand Down
4 changes: 2 additions & 2 deletions HACKING/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ PROXSTAR_REDIS_HOST=proxstar-redis
PROXSTAR_REDIS_PORT=6379

# VNC
PROXSTAR_WEBSOCKIFY_PATH=/opt/app-root/bin/websockify
PROXSTAR_WEBSOCKIFY_TARGET_FILE=/opt/app-root/src/targets
PROXSTAR_WEBSOCKIFY_PATH=/usr/local/bin/websockify
PROXSTAR_WEBSOCKIFY_TARGET_FILE=/opt/proxstar/targets

# SENTRY
# If you set the sentry dsn locally, make sure you use the local-dev or some
Expand Down
48 changes: 48 additions & 0 deletions HACKING/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
services:
proxstar-redis:
image: docker.io/library/redis:alpine
networks:
- proxstar
restart: always

proxstar-postgres:
build:
context: ./proxstar-postgres
environment:
POSTGRES_PASSWORD: changeme
volumes:
- ./proxstar-postgres/volume:/var/lib/postgresql/data:Z
networks:
- proxstar
restart: always

proxstar-rq-scheduler:
build:
context: ..
env_file: .env
entrypoint: ./start_scheduler.sh
networks:
- proxstar
restart: always

proxstar-rq:
build:
context: ..
env_file: .env
entrypoint: ./start_worker.sh
networks:
- proxstar
restart: always

proxstar:
build:
context: ..
ports:
- "8000:8000"
- "8001:8001"
env_file: .env
entrypoint: ["gunicorn", "proxstar:app", "--bind=0.0.0.0:8000"]
networks:
- proxstar
networks:
proxstar:
2 changes: 1 addition & 1 deletion HACKING/proxstar-postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:12
FROM docker.io/library/postgres:12

RUN apt-get update \
&& apt-get install -y postgresql-plperl-12 postgresql-plpython3-12 libnet-ip-perl libnet-ldap-perl libnet-dns-perl libnet-snmp-perl libnet-server-mail-perl libcrypt-des-perl build-essential cpanminus curl \
Expand Down