Merge branch 'v1.4.x'

pull/347/head
Matthew Planchard 2 years ago
commit 8014fa56fc
No known key found for this signature in database
GPG Key ID: AF5C892A5573ABED
  1. 49
      .dockerignore
  2. 9
      CHANGES.rst
  3. 23
      Dockerfile
  4. 4
      README.rst
  5. 16
      entrypoint.sh
  6. 4
      pypiserver/__init__.py

@ -1,41 +1,8 @@
*.class
*.pyc
*.pyo
*.o
*.so
*.os
*.pyd
*.elc
*~
.*.swp
.*.swo
.*.swn
.~
.DS_Store
.ropeproject
ID
__pycache__/
/build/
/dist/
/*.egg*
/MANIFEST
/README.html
/pypi-server-standalone.py
/.project
/.pydevproject
/.tox/
/*.egg-info/
/.standalone
/.coverage
/htmlcov/
/.installed.cfg
/develop-eggs/
/eggs/
/parts/
/.cache/
/.settings/
Dockerfile
venv
.venv
.vscode
.idea
*
!pypiserver
!requirements
!docker-requirements.txt
!entrypoint.sh
!README.rst
!setup.cfg
!setup.py

@ -1,6 +1,15 @@
Changelog
=========
2.0.0 (tbd)
-----------
1.4.2 (2020-10-10)
------------------
- FIX: The entrypoint for the Dockerfile was failing when called with no
arguments (#344, thanks @elfjes!)
1.4.1 (2020-10-05)
------------------

@ -31,7 +31,12 @@ RUN apk add --no-cache --virtual .build-deps \
FROM base AS builder_dependencies
COPY . /code
COPY pypiserver /code/pypiserver
COPY requirements /code/requirements
COPY docker-requirements.txt /code
COPY setup.cfg /code
COPY setup.py /code
COPY README.rst /code
RUN apk add --no-cache --virtual .build-deps \
build-base \
@ -39,11 +44,7 @@ RUN apk add --no-cache --virtual .build-deps \
&& mkdir /install \
&& python -m pip install --no-warn-script-location \
--prefix=/install \
/code --requirement /code/docker-requirements.txt \
&& apk del --no-cache \
.build-deps \
&& rm -rf /var/cache/apk/* \
&& rm -rf /tmp/*
/code --requirement /code/docker-requirements.txt
FROM base
# Copy the libraries installed via pip
@ -51,8 +52,14 @@ COPY --from=builder_dependencies /install /usr/local
COPY --from=builder_gosu /usr/local/bin/gosu /usr/local/bin/gosu
COPY entrypoint.sh /entrypoint.sh
RUN addgroup -S -g 9898 pypiserver \
&& adduser -S -u 9898 -G pypiserver pypiserver \
# Use a consistent user and group ID so that linux users
# can create a corresponding system user and set permissions
# if desired.
RUN apk add bash \
&& rm -rf /var/cache/apk/* \
&& rm -rf /tmp/* \
&& addgroup -S -g 9898 pypiserver \
&& adduser -S -u 9898 -G pypiserver pypiserver --home /data\
&& mkdir -p /data/packages \
&& chmod +x /entrypoint.sh

@ -9,8 +9,8 @@ pypiserver - minimal PyPI server for use with pip/easy_install
==============================================================================
|pypi-ver| |travis-status| |dependencies| |python-ver| |proj-license|
:Version: 1.4.0
:Date: 2020-10-03
:Version: 1.4.2
:Date: 2020-10-10
:Source: https://github.com/pypiserver/pypiserver
:PyPI: https://pypi.org/project/pypiserver/
:Travis: https://travis-ci.org/pypiserver/pypiserver

@ -1,15 +1,11 @@
#!/bin/ash
#!/usr/bin/env bash
set -euo pipefail
chown -R pypiserver:pypiserver /data
# chown the VOLUME mount set in the dockerfile
# If you're using an alternative directory for packages,
# you'll need to ensure that pypiserver has read and
# write access to that directory
chown -R pypiserver:pypiserver /data/packages
if [ "$@" = "" ]; then
# default CMD
echo "Set default option '/data/packages'"
set -- " /data/packages"
else
#
echo "Using custom CMD: $@"
fi
exec gosu pypiserver pypi-server -p "$PORT" $@

@ -2,9 +2,9 @@ import os
import re as _re
import sys
version = __version__ = "1.4.0"
version = __version__ = "1.4.2"
__version_info__ = tuple(_re.split("[.-]", __version__))
__updated__ = "2020-10-03 17:45:07"
__updated__ = "2020-10-10 08:15:56"
__title__ = "pypiserver"
__summary__ = "A minimal PyPI server for use with pip/easy_install."

Loading…
Cancel
Save