Merge pull request #109 from Purplship/purplship-server-2021.5-rc

[release candidate] Purplship Server Edition 2021.5

.docker/Dockerfile

@@ -1,4 +1,16 @@
-FROM python:3.8
+# The base image compilation
+FROM python:3.8-slim AS compile-image
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+COPY requirements.txt /temp/
+RUN pip install --upgrade pip && \
+    pip install -r /temp/requirements.txt
+
+
+# The runtime image
+FROM python:3.8-slim AS build-image
+COPY --from=compile-image /opt/venv /opt/venv
 
 LABEL [email protected]
 LABEL org.opencontainers.image.title="Purplship Server"
@@ -13,22 +25,15 @@ ENV DEBUG_MODE False
 ENV USE_HTTPS False
 ENV ALLOWED_HOSTS *
 ENV SECRET_KEY "w;l5kj65lk6j;lj56kl56jk5l656j5k6jl5"
-
 ENV WORK_DIR /app
 ENV LOG_DIR /log
 ENV STATIC_ROOT_DIR /static
 
-EXPOSE $PURPLSHIP_PORT
-
-RUN mkdir /app /log /static
-WORKDIR /app
-
-COPY requirements.txt /temp/
-COPY gunicorn-cfg.py .docker/entrypoint.sh licenses/APACHE-LICENSE-2.0 /app/
-
-RUN pip install --upgrade pip \
-    pip install -r /temp/requirements.txt
+RUN mkdir $WORK_DIR $LOG_DIR $STATIC_ROOT_DIR
+WORKDIR $WORK_DIR
 
-RUN chmod +x entrypoint.sh
+# Make sure we use the virtualenv:
+ENV PATH="/opt/venv/bin:$PATH"
 
+COPY gunicorn-cfg.py .docker/entrypoint.sh $WORK_DIR/
 ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]

README.md

@@ -19,8 +19,9 @@
 Purplship server is an On-prem or cloud Multi-carrier Shipping API.
 The server is in Python, but you can use any programming language to send API requests to any supported shipping carriers from your application.
 
-- Book a Live Demo here [purplship.com](https://purplship.com/schedule-demo/)
-- Join us on [Discord](https://discord.gg/kXEa3UMRHd)
+- [Book a Live Demo at purplship.com](https://purplship.com/schedule-demo/)
+- [Join us on Discord](https://discord.gg/kXEa3UMRHd)
+- [Become a backer or sponsor on Patreon](https://www.patreon.com/danh91).
 
 
 ## Screenshots
@@ -57,7 +58,7 @@ services:
       POSTGRES_PASSWORD: "postgres"
 
   pship:
-    image: purplship/purplship-server:[version]
+    image: danh91.docker.scarf.sh/purplship/purplship-server:[version]
     restart: unless-stopped
     ports:
       - "5002:5002"
@@ -116,13 +117,13 @@ docker run -d \
   --name pship --rm \
   -e DEBUG_MODE=True \
   --link=db:db -p 5002:5002 \
-  purplship/purplship-server:[version]
+  danh91.docker.scarf.sh/purplship/purplship-server:[version]
 ```
 
 - Create an admin user
 
 ```terminal
-docker exec -it purplship bash -c "purplship createsuperuser"
+docker exec -it pship bash -c "purplship createsuperuser"
 ```
 
 Access the application at http://0.0.0.0:5002
@@ -144,19 +145,16 @@ Here you can find the Open Source Edition released under the `Apache 2`.
 To get the quotation of our Enterprise Edition, please visit www.purplship.com and contact us.
 
 
-|                                          | OSS         | Enterprise   |
-| ---------------------------------------- | ----------- | ------------ |
-| Multi-carrier shipping APIs              | Yes         | Yes          |
-| Carrier accounts                         | Unlimited   | Unlimited    |
-| Hosting                                  | Self-hosted | Self-hosted  |
-| Maintenance & support                    | Community   | Dedicated    |
-| Multi-tenant                             | No          | Yes          |
-| Multi-org (soon)                         | No          | Yes          |
-| Reporting (soon)                         | No          | Yes          |
-| Shipping billing data (soon)             | No          | Yes          |
-| Whitelabel                               | No          | Yes          |
-
-**We encourage you to use the Enterprise edition or sponsor us to sustain this project.**
+|                                          | OSS         | Bronze Sponsor | Enterprise   |
+| ---------------------------------------- | ----------- | -------------- | ------------ |
+| Multi-carrier shipping APIs              | Yes         | Yes            | Yes          |
+| Carrier accounts                         | Unlimited   | Unlimited      | Unlimited    |
+| Hosting                                  | Self-hosted | Self-hosted    | Self-hosted  |
+| Maintenance & support                    | Community   | Priority Ticket| Dedicated    |
+| Whitelabel                               | No          | Yes            | Yes          |
+| Multi-tenant & Multi-org                 | No          | No             | Yes          |
+| Reporting & Analytics (soon)             | No          | No             | Yes          |
+| Shipping billing data (soon)             | No          | No             | Yes          |
 
 
 ## Official Client Libraries
@@ -170,12 +168,11 @@ Use the [swagger editor](https://editor.swagger.io/) to generate any additional
 
 ## Resources
 
-- **Documentation** - Learn more at [docs.purplship.com](https://docs.purplship.com)
-- **Community** - Feature requests, general questions on [Discord](https://discord.gg/kXEa3UMRHd)
-- **Bug Tracker** - [File bugs](https://github.com/Purplship/purplship-server/issues)
-- **Blog** - Get the latest updates from the [Puprlship blog](https://blog.purplship.com).
-- **Twitter** - Follow [Purplship](https://twitter.com/purplship).
-
+- [**Documentation**](https://docs.purplship.com)
+- [**Community on Discord**](https://discord.gg/kXEa3UMRHd)
+- [**Bug Tracker**](https://github.com/PurplShip/purplship/issues)
+- [**Blog**](https://blog.purplship.com)
+- [**@Purplship on Twitter**](https://twitter.com/purplship)
 
 ## License