mirror of
https://github.com/peeringdb/peeringdb.git
synced 2024-05-11 05:55:09 +00:00
* install django-grainy * nsp to grainy first iteration * nsp to grainy second iteration * grainy and django-grainy pinned to latest releases * Fix typo * Update djangorestframework, peeringdb, django-ratelimit * Rewrite login view ratelimit decorator * Relock pipfile * add list() to make copy of dictionaries before iterating * relock pipfile with python3.9 change docker to use python3.9 * add ordering to admin search queryset for deskproticket and email * add org api key and begin to write tests * additional key tests * add drf-api-keys to pipfile * Wire orgapikey to modelviewsetpermissions * Update api key helper functions * add put test * Add Org API key tab to frontend * Add user api key model * Update user key handling and tests * Update APIPermissionsApplicator to make it work w requests * Add org api key perm panel * add org key permissions * Add user api key views * Add templates for handling user api key (adding, not revoking) * relock pipfile * assorted fixes and tweaks * Add general user group permissions and org user group perms * refactor org api key perms * Add tests for api keys * Add docstrings to permissions helpers * Add api key examples * squash migrations * remove custom api key header config * Change api key test setup * Update permissions for grainy change * Bump up pipfile and pipfile.lock * Add API Key to Verification Queue Item * Delete travis * Add workaround to Dockerfile * update pipfile and sort out migrations * Add comment to Dockerfile * Re-add API Key migrations * Add locale to .gitignore * remove suggest functionality from ix * Update test to recognize that IX api no longer has suggest function * Add test to outlaw POSTing an IX w its org equal to the suggest entity org * Add meta information geowarning * Add alert to demonstrate UI * Add error to fac update * Add template warning for geovalidation * Add geowarning meta js * cover absent meta_response test case * Update styles for geowarning * refactor geotag warning implementation * null lat and long on unsuccessful geo locate * modify geovalidation frontend update * Add deskproticket model email field * Add missing span * add email to org keys * Add email to org key tests * update serializer with rdap validation wrapper * update admin for api keys * Enable writing an email as part of org key creation * Add email validation to org api key form * fix css style on perm row * Add suggested info to api response * display suggested address on frontend * add needs geocode to serializer * save lat long on forward geonormalization * add address suggestion submit button * Add suggested address popin to ADD facility form * Fix css * add lat and long rounding to geocodenabled model clean method * add migration and regression test for lat long decimal db constraint * Add another regression test for model decimal places * Get deskpro functions passing isort and flake * Update ticket_queue_deletion_prevented * update ticket_queue_deletion_prevented for use with org api key * add template for org key dpt from asnauto skipvq * Update deskproticket for rdap error * add facility aka * add aka to serializer and views * black and isort test api keys * fix typo in org key deskpro template * skip or rewrite unapplicable org key tests, and add as_set tests * adjust api key test comments * Add vqi_notify to signals * Add reversion comments for api keys and helper function * update how org keys are added to verification queue items * rename verification queue item fk from api_key to org_key * fix group id error * update key tests with correct http header info * check both user and key, not just user * templates fiex * adapt deskpro integration to work with email only * make org api keys editable for desc and email * pipfile relock * edit test setupdata settings for groups * Change comment to signify we don't need to remove code * address untranslated accept button * Add docstrings to the serializer functions * Add loading shim * Add migration for all longname and aka * Add aka and long name to views and serializers * delete migration w decimals * standardize serializer lat and long fields * Add clean rounding for lat and long * fix serializer error * api key admin improvements * fix linebreak in user api key form * remove debug prints * Add rounding util * Add rounding to lat and long fields * remove 'clean' from geocode method (logic now in admin form) * remove erroneous tests * revert serializer changes * Fix migrations * Add long name and aka to admin models * Update API key docs * Add documentation for api keys * fix typo * fix org api key revoke broken by editable api keys * doc tweaks * doc tweaks * doc tweaks * black format * fix migration hierarchy * docs * docs * api key permissions screenshot * formatting * formatting * padding fixed * remove one image * fix get_user_from_request type checking take out POST only valdiator for entity suggest * didnt mean to commit the django-peeringdb mount * fix suggest on PUT net fix tests * black formatting * update org key permission template * install rust for cryptography * pipfile relock (django-peeringdb to 2.6) Co-authored-by: Stefan Pratter <stefan@20c.com> Co-authored-by: Elliot Frank <elliot@20c.com>
119 lines
2.4 KiB
Docker
119 lines
2.4 KiB
Docker
# RUN true is used here to separate problematic COPY statements,
|
|
# per this issue: https://github.com/moby/moby/issues/37965
|
|
|
|
FROM python:3.9-alpine as base
|
|
|
|
ARG virtual_env=/srv/www.peeringdb.com/venv
|
|
|
|
ENV VIRTUAL_ENV="$virtual_env"
|
|
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
|
|
|
|
|
|
# build container
|
|
FROM base as builder
|
|
|
|
RUN apk --update --no-cache add \
|
|
g++ \
|
|
libjpeg-turbo-dev \
|
|
linux-headers \
|
|
make \
|
|
mariadb-dev \
|
|
libffi-dev \
|
|
curl
|
|
|
|
|
|
# Install Rust to install Poetry
|
|
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
|
|
ENV PATH="/root/.cargo/bin:${PATH}"
|
|
|
|
|
|
# create venv
|
|
RUN pip install -U pip pipenv
|
|
RUN python3 -m venv "$VIRTUAL_ENV"
|
|
|
|
WORKDIR /srv/www.peeringdb.com
|
|
ADD Pipfile* ./
|
|
RUN pipenv install --ignore-pipfile
|
|
|
|
# inetd
|
|
RUN apk add busybox-extras
|
|
|
|
|
|
#### final image here
|
|
|
|
FROM base as final
|
|
|
|
ARG uid=996
|
|
|
|
# extra settings file if needed
|
|
ARG ADD_SETTINGS_FILE=mainsite/settings/dev.py
|
|
|
|
# add dependencies
|
|
RUN apk add gettext libjpeg-turbo mariadb-connector-c
|
|
|
|
RUN adduser -Du $uid pdb
|
|
|
|
WORKDIR /srv/www.peeringdb.com
|
|
COPY --from=builder "$VIRTUAL_ENV" "$VIRTUAL_ENV"
|
|
|
|
RUN mkdir -p api-cache etc locale media static var/log
|
|
COPY manage.py .
|
|
# container exec whois
|
|
COPY in.whoisd .
|
|
COPY Ctl/VERSION etc
|
|
COPY docs/ docs
|
|
COPY mainsite/ mainsite
|
|
RUN true
|
|
COPY $ADD_SETTINGS_FILE mainsite/settings/
|
|
RUN true
|
|
COPY peeringdb_server/ peeringdb_server
|
|
COPY fixtures/ fixtures
|
|
COPY .coveragerc .coveragerc
|
|
RUN mkdir coverage
|
|
|
|
COPY scripts/manage /usr/bin/
|
|
COPY Ctl/docker/entrypoint.sh /
|
|
|
|
# inetd for whois
|
|
COPY --from=builder /usr/sbin/inetd /usr/sbin/
|
|
RUN true
|
|
COPY Ctl/docker/inetd.conf /etc/
|
|
|
|
RUN chown -R pdb:pdb api-cache locale media var/log coverage
|
|
|
|
#### test image here
|
|
FROM final as tester
|
|
|
|
WORKDIR /srv/www.peeringdb.com
|
|
# copy from builder in case we're testing new deps
|
|
COPY --from=builder /srv/www.peeringdb.com/Pipfile* ./
|
|
RUN true
|
|
COPY tests/ tests
|
|
RUN chown -R pdb:pdb tests/
|
|
COPY Ctl/docker/entrypoint.sh .
|
|
|
|
RUN pip install -U pipenv
|
|
RUN pipenv install --dev --ignore-pipfile -v
|
|
#RUN echo `which python`
|
|
#RUN pip freeze
|
|
#RUN pytest -v -rA --cov-report term-missing --cov=peeringdb_server tests/
|
|
|
|
USER pdb
|
|
ENTRYPOINT ["./entrypoint.sh"]
|
|
CMD ["runserver", "$RUNSERVER_BIND"]
|
|
|
|
#### entry point from final image, not tester
|
|
FROM final
|
|
|
|
COPY Ctl/docker/entrypoint.sh .
|
|
RUN true
|
|
COPY Ctl/docker/django-uwsgi.ini etc/
|
|
|
|
ENV UWSGI_SOCKET="127.0.0.1:7002"
|
|
ENV RUNSERVER_BIND="127.0.0.1:8080"
|
|
|
|
USER pdb
|
|
|
|
ENTRYPOINT ["./entrypoint.sh"]
|
|
CMD ["runserver", "$RUNSERVER_BIND"]
|