mirror of
https://github.com/peeringdb/peeringdb.git
synced 2024-05-11 05:55:09 +00:00
b07baf3092
* install django-grainy * nsp to grainy first iteration * Fix validation error message overflow * Add migration, update views.py and template to add help_text to UI * nsp to grainy second iteration * grainy and django-grainy pinned to latest releases * deskpro ticket cc (#875) * black formatting * move ac link to bottom for ticket body * Fix typo * Update djangorestframework, peeringdb, django-ratelimit * Rewrite login view ratelimit decorator * Relock pipfile * add list() to make copy of dictionaries before iterating * respect ix-f url visibilty in ix-f conflict emails * Add type coercion to settings taken from environment variables * Add bool handling * relock pipfile with python3.9 change docker to use python3.9 * Check bool via isinstance * add ordering to admin search queryset for deskproticket and email * update settings with envvar_type option * Add tooltips to add ix and add exchange views (in org) * Add tooltip to suggest fac view * get phone information in view * add missing migration * add migration and make org a geo model * Wire normalization to put/create requests for Facility * Update admin with new address fields * Refactor serializer using mixin * Add floor and suite to address API * Write command to geonormalize existing entries * Remove unnecessary method from model * Add floor and suite to views * Add ignore geo status * Force refresh for fac and org updates * adjust frontend typo * add checking if update needs geosync * redo error handling for geosync * remove save keyword from geonormalize command script * change raw_id_fields * alternate autocomplete lookup field depending on where inline is called * remove unnecessary error handling * Add csv option * Fix bug with None vs empty string * add regex parsing for suite and floor conversion * Add migration that removes geo error as a field * add geostatus update to command * Ignore suite floor and address2 changes for api normalization * update geomodel by removing geo_error * Black models.py * Black serializers.py * remove geocode error from admin * Add function for reversing pretty speed * add conversion to export method * fix typo * fix speed value feedback after submit * remove conditional * Add error handling to create endpoint * Refine floor and suite parsing regex * Add geocoding tests * Add json for tests * IX-F Importer: Bogus output of "Preview" tool #896 * remove cruft * black formatting * IX-F Importer: history of changes per ixlan & netixlan #893 * 6 add geocode to org view * 4 update geocode without refresh * Update error display * Fix bug with formatting translated string * Add DateTimeFields to model * Add update signals * add last updated fields to views and serializers * Add last updated model migration * Add the data migration for last updated fields * add test that tests a normal org user with create org permissions * grainy to 1.7 django grainy to 1.9.1 * Fix formatting issues * Adjust var names * Refactor signals * Temporary: save override from network model * Empty vlan lists no longer cause error * typo in ixf.py * typo in admin * Typos in model verbose names * Add serializer IXLAN validation for ixf_ixp_import_enabled * Add model validation to IXLan * relock pipfile * relock pipfile * begin signal test file * Remove full clean from save in ixlan * use post_reversion_commit signal instead * remove redundant save override * remove cruft / debug code * Add signal tests * exclude organizations with city missing from commandline geosync * Skip geosync if the only address information we have is a country * initial commit for vlan matcher in importer * Add more tests and remove unused imports * update tests * Actually add vlan matching to importer * Add type checking for speed list and state * Change how we register connection.state * add bootstrap options * add rdap cache command * remove outdated perm docs * rdap from master and relock * propagate rdap settings to peeringdb.settings * add loaddata for initial fixtures * user friendly error message on RdapNotFound errors (#497) * update rdap errors * django-peeringdb to 2.5.0 and relock * rdap to 1.2.0 and relock * fix migration hierarchy * add ignore_recurse_errors option * add missing fields to mock remove cruft missed during merge * rdap to 1.2.1 * dont geo validate during api tests * fix tests * Add test file * fix merge * RDAP_SELF_BOOTSTRAP to False while running tests * black formatted * run black * add github actions * add runs on Co-authored-by: Stefan Pratter <stefan@20c.com> Co-authored-by: Elliot Frank <elliot@20c.com>
104 lines
2.1 KiB
Docker
104 lines
2.1 KiB
Docker
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
|
|
|
|
# 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
|
|
COPY $ADD_SETTINGS_FILE mainsite/settings/
|
|
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/
|
|
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* ./
|
|
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 .
|
|
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"]
|