Commit 889dc191 authored by juga's avatar juga
Browse files

Merge branch 'issue69_04_dependencies' into 'master' 

Set default auto field

Closes #69

See merge request !110
parents d7469010 adcaa6ed

.containerignore

0 → 100644
+12 −0
Original line number Diff line number Diff line 
.git

.gitignore

.gitlab-ci.yml

.nvmrc

.tmp

.vscode

Containerfile

CONTRIBUTING.md

LICENSE

mock-data

.env

ticketlobby/local.py
 
 No newline at end of file

.gitignore

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
*.pyc

*~

__pycache__

build/

*.egg-info/



# macOS

._*
@@ -38,3 +40,8 @@ coverage.xml 
*.sqlite3

db.sqlite3



# Django static

static/



# Django local settings

ticketlobby/local.py
 
 No newline at end of file

.gitlab-ci.yml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
---

variables:

  TAG_LATEST: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME:latest

  TAG_COMMIT: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA



build-container:

  stage: build

  interruptible: true

  image:

    name: containers.torproject.org/tpo/tpa/base-images/podman:bookworm

  tags:

    - amd64

    - docker

    - tpa

  variables:

    SECRET_KEY: $CI_JOB_ID



  script:

    - export TMPDIR=$(pwd)/.tmp

    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

    - podman build -t ${TAG_COMMIT} -t ${TAG_LATEST} .

    - podman push ${TAG_COMMIT}

    - podman push ${TAG_LATEST}

  cache:

    key: buildah-cache

    paths:

      - .tmp/buildah-cache*

Containerfile

0 → 100644
+61 −0
Original line number Diff line number Diff line 
FROM containers.torproject.org/tpo/tpa/base-images/python:bookworm



ENV PYTHONFAULTHANDLER=1 \

  PYTHONUNBUFFERED=1 \

  PYTHONHASHSEED=random \

  PIP_DISABLE_PIP_VERSION_CHECK=on \

  PIP_DEFAULT_TIMEOUT=100 \

  WORKDIR=/home/anonticket/anon_ticket \

  VIRTUAL_ENV=/home/anonticket/.env \

  PATH="/home/anonticket/.env/bin:$PATH" \

  CSRF_TRUSTED_ORIGIN="http://localhost:8000" \

  DEBUG=False \

  SECRET_KEY=CHANGEME \

  ALLOWED_HOSTS=".anonticket.torproject.org," \

  GITLAB_ACCOUNTS_SECRET_TOKEN=CHANGEME \

  GITLAB_SECRET_TOKEN=CHANGEME \

  GITLAB_URL="https://gitlab.torproject.org/" \

  AUTO_ACCEPT_LIST="" \

  BLOCK_ALL=False \

  GITLAB_TIMEOUT=10 \

  LIMIT_RATE=60/m \

  MAIN_RATE_GROUP=main_rate_bucket \

  TIMEOUT_URL="http://10.0.0.0/"

  

# run-time dependencies

RUN apt-get update && \

  apt-get install -y --no-install-recommends \

    python-is-python3 \

    python3-poetry \

    && \

  apt-get clean && \

  rm -rf /var/lib/apt/lists/*



# Create unprivileged anonticket user/group

RUN groupadd -r -g 999 anonticket && \

  useradd --no-log-init -r -m -u 999 -g anonticket anonticket



# Work in application directory

WORKDIR /home/anonticket/anon_ticket



# Expose port 8000/tcp for gunicorn

EXPOSE 8000



# Copy all project files (minus those ignored)

COPY --chown=anonticket:anonticket . .



# Create virtualenv and install anonticket app

# then make home directory owned by the right user

RUN --mount=type=cache,target=/root/.cache/pypoetry/cache \

  --mount=type=cache,target=/root/.cache/pypoetry/artifacts \

  --mount=type=cache,target=/root/.cache/pip \

  python3 -m venv /home/anonticket/.env && \

  poetry install --without=dev --no-interaction --no-ansi && \

  poetry run ./manage.py makemigrations && \

  chown anonticket:anonticket -R /home/anonticket



# Switch to anonticket user

USER anonticket



# Launch the app

CMD ["./launch.sh"]

compose.yml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
version: "3.7"



services:

    app:

        build:

            context: ./

            dockerfile: Containerfile

            container_name: anonticket

        # To add a local.py file

        # volumes:

        #     - ./ticketlobby/local.py:/home/anonticket/anon_ticket/ticketlobby/local.py

        ports:

            - 8000:8000

        env_file:

          - ./.env
 
 No newline at end of file