Skip to content

fixes to enable s3 and postgres use #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svozza wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes to enable s3 and postgres use #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
README.md
LICENSE
9 changes: 5 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM python:2.7
# Default credentials: admin/secret
# Use ppc-gen-password to generate new value.
ENV PYPICLOUD_VERSION=0.4.0 \
CONFD_VERSION=0.12.0-alpha3 \
CONFD_VERSION=0.13.0 \
PYPI_ADMIN_PASSWORD='$6$rounds=704055$kq8HTiZC50zoffwq$T335/H9UxRegwAxcuTUggt.ip2CBpP18wTxOAGpK8DLBZ3jC2yVklFQxRtOd5tHqmzaxDIuq0VUJb/lzaLhNW0' \
PYPI_DB_URL=sqlite:////var/lib/pypicloud/db.sqlite \
PYPI_AUTH_DB_URL=sqlite:////var/lib/pypicloud/db.sqlite \
Expand All @@ -15,10 +15,10 @@ ENV PYPICLOUD_VERSION=0.4.0 \
PYPI_STORAGE=file \
PYPI_STORAGE_DIR=/var/lib/pypicloud/packages \
PYPI_STORAGE_BUCKET=changeme \
AWS_ACCESS_KEY_ID=changeme \
AWS_SECRET_ACCESS_KEY=changeme \
PYPI_STORAGE_REGION=eu-west-1 \
PYPI_AUTH=config \
PYPI_DEFAULT_READ=authenticated \
PYPI_DEFAULT_WRITE= \
PYPI_CACHE_UPDATE=authenticated \
PYPI_HTTP=0.0.0.0:8080 \
PYPI_PROCESSES=20 \
Expand All @@ -39,7 +39,8 @@ RUN DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y --force-yes -q \
build-essential libldap2-dev libldap-2.4 libsasl2-dev libsasl2-2 && \
pip install --no-cache-dir uwsgi && \
pip install --no-cache-dir pypicloud[ldap]==$PYPICLOUD_VERSION && \
pip install --no-cache-dir pypicloud[ldap,dynamo]==$PYPICLOUD_VERSION \
requests uwsgi pastescript redis mysql-python psycopg2 && \
mkdir -p /etc/confd/conf.d /etc/confd/templates /var/lib/pypicloud/packages && \
apt-get purge -y build-essential libldap2-dev libsasl2-dev && \
apt-get clean && \
Expand Down
2 changes: 2 additions & 0 deletions config.ini.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ storage.dir = {{ getv "/pypi/storage/dir" }}
# S3 storage configs.
# Key and secret pulled from AWS_* variables.
storage.bucket = {{ getv "/pypi/storage/bucket" }}
storage.region = {{ getv "/pypi/storage/region" }}
storage.calling_format = OrdinaryCallingFormat

pypi.auth = {{ getv "/pypi/auth" }}
pypi.default_read = {{ getv "/pypi/default/read" }}
pypi.default_write = {{ getv "/pypi/default/read" }}
pypi.cache_update = {{ getv "/pypi/cache/update" }}

auth.admins =
Expand Down
2 changes: 2 additions & 0 deletions config.ini.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ keys = [
"/pypi/storage/dir",
"/pypi/auth",
"/pypi/default/read",
"/pypi/default/write",
"/pypi/cache/update",
"/pypi/admin/password",
"/pypi/db/url",
Expand All @@ -18,6 +19,7 @@ keys = [
"/pypi/processes",
"/pypi/http",
"/pypi/storage/bucket",
"/pypi/storage/region",
"/pypi/ssl/crt",
"/pypi/ssl/key",
"/pypi/ldap/url",
Expand Down