diff --git a/CHANGELOG b/CHANGELOG index b9e42333..4869fb15 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +## 2.17.1 +- pydal 18.08 +- many small bug fixes + ## 2.16.1 - pydal 17.11 - bootstrap 4 diff --git a/Makefile b/Makefile index 7362ca2f..870c51f9 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ rmfiles: rm -rf applications/examples/uploads/* src: ### Use semantic versioning - echo 'Version 2.16.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.17.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files #make clean # make rmfiles diff --git a/VERSION b/VERSION index 60ae417d..5cb3e1ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.16.1-stable+timestamp.2018.05.24.15.00.45 +Version 2.17.1-stable+timestamp.2018.08.05.17.57.00 diff --git a/docker/alpine/web2py-gevent/Dockerfile b/docker/alpine/web2py-gevent/Dockerfile new file mode 100755 index 00000000..0152f880 --- /dev/null +++ b/docker/alpine/web2py-gevent/Dockerfile @@ -0,0 +1,27 @@ +FROM alpine:latest + +#LABEL your_label + +RUN apk add --no-cache python py-pip py-setuptools unzip wget py-gevent && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN addgroup -S web2py && \ + adduser -D -S -G web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/alpine/web2py-gevent/README.md b/docker/alpine/web2py-gevent/README.md new file mode 100755 index 00000000..47a5c143 --- /dev/null +++ b/docker/alpine/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Alpine/web2py-gevent + docker build -t your_username/alpine-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-gevent your_username/alpine-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Alpine/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Alpine/web2py-gevent + docker login -u your_username + docker build -t your_username/alpine-web2py-gevent . + docker push your_username/alpine-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/alpine-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-gevent your_username/alpine-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/alpine/web2py-gevent/docker-compose.yml b/docker/alpine/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/alpine/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/alpine/web2py-gunicorn/Dockerfile b/docker/alpine/web2py-gunicorn/Dockerfile index c50f4c1b..812d8653 100755 --- a/docker/alpine/web2py-gunicorn/Dockerfile +++ b/docker/alpine/web2py-gunicorn/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:latest +#LABEL your_label + RUN apk add --no-cache python py-pip py-setuptools unzip wget py-gunicorn && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/alpine/web2py-gunicorn/README.md b/docker/alpine/web2py-gunicorn/README.md index 828277cf..90f987a0 100755 --- a/docker/alpine/web2py-gunicorn/README.md +++ b/docker/alpine/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Alpine/web2py-gunicorn - docker build -t username/alpine-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-gunicorn username/alpine-web2py-gunicorn + docker build -t your_username/alpine-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-gunicorn your_username/alpine-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Alpine/web2py-gunicorn - docker login -u username - docker build -t username/alpine-web2py-gunicorn . - docker push username/alpine-web2py-gunicorn + docker login -u your_username + docker build -t your_username/alpine-web2py-gunicorn . + docker push your_username/alpine-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/alpine-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-gunicorn username/alpine-web2py-gunicorn +docker build -t your_username/alpine-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-gunicorn your_username/alpine-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/alpine/web2py-paste/Dockerfile b/docker/alpine/web2py-paste/Dockerfile new file mode 100755 index 00000000..01954d1a --- /dev/null +++ b/docker/alpine/web2py-paste/Dockerfile @@ -0,0 +1,27 @@ +FROM alpine:latest + +#LABEL your_label + +RUN apk add --no-cache python py-pip py-setuptools unzip wget && \ + pip install --upgrade pip && \ + pip install virtualenv paste + +RUN addgroup -S web2py && \ + adduser -D -S -G web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/alpine/web2py-paste/README.md b/docker/alpine/web2py-paste/README.md new file mode 100755 index 00000000..026d0382 --- /dev/null +++ b/docker/alpine/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Alpine/web2py-paste + docker build -t your_username/alpine-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-paste your_username/alpine-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Alpine/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Alpine/web2py-paste + docker login -u your_username + docker build -t your_username/alpine-web2py-paste . + docker push your_username/alpine-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/alpine-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-paste your_username/alpine-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/alpine/web2py-paste/docker-compose.yml b/docker/alpine/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/alpine/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/alpine/web2py-rocket-ssl/Dockerfile b/docker/alpine/web2py-rocket-ssl/Dockerfile index 6720178a..05a8c47d 100755 --- a/docker/alpine/web2py-rocket-ssl/Dockerfile +++ b/docker/alpine/web2py-rocket-ssl/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:latest +#LABEL your_label + RUN apk add --no-cache python py-pip py-setuptools unzip wget openssl && \ pip install --upgrade pip && \ pip install virtualenv @@ -9,7 +11,7 @@ RUN wget -c http://web2py.com/examples/static/web2py_src.zip && \ rm -rf /web2py/applications/examples && \ cd /web2py && \ openssl genrsa 1024 > web2py.key && chmod 400 web2py.key && \ - openssl req -new -x509 -nodes -sha1 -days 1780 -subj '/C=c/ST=st/L=l/O=o/OU=ou/CN=cn.com' -key web2py.key > web2py.crt && \ + openssl req -new -x509 -nodes -sha1 -days 1780 -subj '/C=ID/ST=Jakarta/L=Jakarta/O=stifix/OU=IT/CN=stifix.com' -key web2py.key > web2py.crt && \ openssl x509 -noout -fingerprint -text < web2py.crt > web2py.info && \ chmod 755 -R /web2py diff --git a/docker/alpine/web2py-rocket-ssl/README.md b/docker/alpine/web2py-rocket-ssl/README.md index a6e104d1..f64eaa82 100755 --- a/docker/alpine/web2py-rocket-ssl/README.md +++ b/docker/alpine/web2py-rocket-ssl/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Alpine/web2py-rocket-ssl - docker build -t username/alpine-web2py-rocket-ssl . - docker run -d -v applications:/web2py/applications -p 443:443 --name alpine-web2py-rocket-ssl username/alpine-web2py-rocket-ssl + docker build -t your_username/alpine-web2py-rocket-ssl . + docker run -d -v applications:/web2py/applications -p 443:443 --name alpine-web2py-rocket-ssl your_username/alpine-web2py-rocket-ssl docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Alpine/web2py-rocket-ssl - docker login -u username - docker build -t username/alpine-web2py-rocket-ssl . - docker push username/alpine-web2py-rocket-ssl + docker login -u your_username + docker build -t your_username/alpine-web2py-rocket-ssl . + docker push your_username/alpine-web2py-rocket-ssl # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/alpine-web2py-rocket-ssl . -docker run -d -v applications:/web2py/applications -p 443:443 --name alpine-web2py-rocket-ssl username/ +docker build -t your_username/alpine-web2py-rocket-ssl . +docker run -d -v applications:/web2py/applications -p 443:443 --name alpine-web2py-rocket-ssl your_username/ docker-compose up -d docker-compose ps diff --git a/docker/alpine/web2py-rocket/Dockerfile b/docker/alpine/web2py-rocket/Dockerfile index ed228fcf..404e0f45 100755 --- a/docker/alpine/web2py-rocket/Dockerfile +++ b/docker/alpine/web2py-rocket/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:latest +#LABEL your_label + RUN apk add --no-cache python py-pip py-setuptools unzip wget && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/alpine/web2py-rocket/README.md b/docker/alpine/web2py-rocket/README.md index d33c1467..ffddbafe 100755 --- a/docker/alpine/web2py-rocket/README.md +++ b/docker/alpine/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Alpine/web2py-rocket - docker build -t username/alpine-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-rocket username/alpine-web2py-rocket + docker build -t your_username/alpine-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-rocket your_username/alpine-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Alpine/web2py-rocket - docker login -u username - docker build -t username/alpine-web2py-rocket . - docker push username/alpine-web2py-rocket + docker login -u your_username + docker build -t your_username/alpine-web2py-rocket . + docker push your_username/alpine-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/alpine-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-rocket username/ +docker build -t your_username/alpine-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-rocket your_username/ docker-compose up -d docker-compose ps diff --git a/docker/alpine/web2py-tornado/Dockerfile b/docker/alpine/web2py-tornado/Dockerfile index 05d9241e..8693a0f4 100755 --- a/docker/alpine/web2py-tornado/Dockerfile +++ b/docker/alpine/web2py-tornado/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:latest +#LABEL your_label + RUN apk add --no-cache python py-pip py-setuptools unzip wget py-tornado && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/alpine/web2py-tornado/README.md b/docker/alpine/web2py-tornado/README.md index ea034bee..3957080b 100755 --- a/docker/alpine/web2py-tornado/README.md +++ b/docker/alpine/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Alpine/web2py-tornado - docker build -t username/alpine-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-tornado username/alpine-web2py-tornado + docker build -t your_username/alpine-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-tornado your_username/alpine-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Alpine/web2py-tornado - docker login -u username - docker build -t username/alpine-web2py-tornado . - docker push username/alpine-web2py-tornado + docker login -u your_username + docker build -t your_username/alpine-web2py-tornado . + docker push your_username/alpine-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/alpine-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-tornado username/ +docker build -t your_username/alpine-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-tornado your_username/ docker-compose up -d docker-compose ps diff --git a/docker/alpine/web2py-waitress/Dockerfile b/docker/alpine/web2py-waitress/Dockerfile new file mode 100755 index 00000000..3b093207 --- /dev/null +++ b/docker/alpine/web2py-waitress/Dockerfile @@ -0,0 +1,27 @@ +FROM alpine:latest + +#LABEL your_label + +RUN apk add --no-cache python py-pip py-setuptools unzip wget py-waitress && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN addgroup -S web2py && \ + adduser -D -S -G web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/alpine/web2py-waitress/README.md b/docker/alpine/web2py-waitress/README.md new file mode 100755 index 00000000..760cb0af --- /dev/null +++ b/docker/alpine/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Alpine/web2py-waitress + docker build -t your_username/alpine-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-waitress your_username/alpine-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Alpine/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Alpine/web2py-waitress + docker login -u your_username + docker build -t your_username/alpine-web2py-waitress . + docker push your_username/alpine-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/alpine-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-waitress your_username/alpine-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/alpine/web2py-waitress/docker-compose.yml b/docker/alpine/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/alpine/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/alpine/web2py-wsgiref/Dockerfile b/docker/alpine/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..0f6c9cc7 --- /dev/null +++ b/docker/alpine/web2py-wsgiref/Dockerfile @@ -0,0 +1,27 @@ +FROM alpine:latest + +#LABEL your_label + +RUN apk add --no-cache python py-pip py-setuptools unzip wget && \ + pip install --upgrade pip && \ + pip install virtualenv wsgiref + +RUN addgroup -S web2py && \ + adduser -D -S -G web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/alpine/web2py-wsgiref/README.md b/docker/alpine/web2py-wsgiref/README.md new file mode 100755 index 00000000..9fc8c0ca --- /dev/null +++ b/docker/alpine/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Alpine/web2py-wsgiref + docker build -t your_username/alpine-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-wsgiref your_username/alpine-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Alpine/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Alpine/web2py-wsgiref + docker login -u your_username + docker build -t your_username/alpine-web2py-wsgiref . + docker push your_username/alpine-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/alpine-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name alpine-web2py-wsgiref your_username/alpine-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/alpine/web2py-wsgiref/docker-compose.yml b/docker/alpine/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/alpine/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/centos/web2py-eventlet/Dockerfile b/docker/centos/web2py-eventlet/Dockerfile new file mode 100755 index 00000000..71e6d0bb --- /dev/null +++ b/docker/centos/web2py-eventlet/Dockerfile @@ -0,0 +1,28 @@ +FROM centos:latest + +#LABEL your_label + +RUN yum install -y epel-release && \ + yum install -y python python-pip python-setuptools unzip wget python-eventlet --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s eventlet -i 0.0.0.0 -p 8000 diff --git a/docker/centos/web2py-eventlet/README.md b/docker/centos/web2py-eventlet/README.md new file mode 100755 index 00000000..ab54e51f --- /dev/null +++ b/docker/centos/web2py-eventlet/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Centos/web2py-eventlet + docker build -t your_username/centos-web2py-eventlet . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-eventlet your_username/centos-web2py-eventlet + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Centos/web2py-eventlet + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Centos/web2py-eventlet + docker login -u your_username + docker build -t your_username/centos-web2py-eventlet . + docker push your_username/centos-web2py-eventlet + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/centos-web2py-eventlet . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-eventlet your_username/centos-web2py-eventlet + +docker-compose up -d +docker-compose ps diff --git a/docker/centos/web2py-eventlet/docker-compose.yml b/docker/centos/web2py-eventlet/docker-compose.yml new file mode 100755 index 00000000..0191e132 --- /dev/null +++ b/docker/centos/web2py-eventlet/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-eventlet: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/centos/web2py-gevent/Dockerfile b/docker/centos/web2py-gevent/Dockerfile new file mode 100755 index 00000000..380faf85 --- /dev/null +++ b/docker/centos/web2py-gevent/Dockerfile @@ -0,0 +1,28 @@ +FROM centos:latest + +#LABEL your_label + +RUN yum install -y epel-release && \ + yum install -y python python-pip python-setuptools unzip wget python-gevent --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/centos/web2py-gevent/README.md b/docker/centos/web2py-gevent/README.md new file mode 100755 index 00000000..7a7a3e4f --- /dev/null +++ b/docker/centos/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Centos/web2py-gevent + docker build -t your_username/centos-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-gevent your_username/centos-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Centos/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Centos/web2py-gevent + docker login -u your_username + docker build -t your_username/centos-web2py-gevent . + docker push your_username/centos-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/centos-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-gevent your_username/centos-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/centos/web2py-gevent/docker-compose.yml b/docker/centos/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/centos/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/centos/web2py-gunicorn/Dockerfile b/docker/centos/web2py-gunicorn/Dockerfile index 8721842c..61746bee 100755 --- a/docker/centos/web2py-gunicorn/Dockerfile +++ b/docker/centos/web2py-gunicorn/Dockerfile @@ -1,5 +1,7 @@ FROM centos:latest +#LABEL your_label + RUN yum install -y epel-release && \ yum install -y python python-pip python-setuptools unzip wget python-gunicorn --nogpgcheck && \ pip install --upgrade pip && \ diff --git a/docker/centos/web2py-gunicorn/README.md b/docker/centos/web2py-gunicorn/README.md index 7dbdd29e..1e44a219 100755 --- a/docker/centos/web2py-gunicorn/README.md +++ b/docker/centos/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Centos/web2py-gunicorn - docker build -t username/centos-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-gunicorn username/centos-web2py-gunicorn + docker build -t your_username/centos-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-gunicorn your_username/centos-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Centos/web2py-gunicorn - docker login -u username - docker build -t username/centos-web2py-gunicorn . - docker push username/centos-web2py-gunicorn + docker login -u your_username + docker build -t your_username/centos-web2py-gunicorn . + docker push your_username/centos-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/centos-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-gunicorn username/centos-web2py-gunicorn +docker build -t your_username/centos-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-gunicorn your_username/centos-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/centos/web2py-paste/Dockerfile b/docker/centos/web2py-paste/Dockerfile new file mode 100755 index 00000000..ce8afd9d --- /dev/null +++ b/docker/centos/web2py-paste/Dockerfile @@ -0,0 +1,28 @@ +FROM centos:latest + +#LABEL your_label + +RUN yum install -y epel-release && \ + yum install -y python python-pip python-setuptools unzip wget python-paste --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/centos/web2py-paste/README.md b/docker/centos/web2py-paste/README.md new file mode 100755 index 00000000..ea9737a8 --- /dev/null +++ b/docker/centos/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Centos/web2py-paste + docker build -t your_username/centos-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-paste your_username/centos-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Centos/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Centos/web2py-paste + docker login -u your_username + docker build -t your_username/centos-web2py-paste . + docker push your_username/centos-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/centos-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-paste your_username/centos-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/centos/web2py-paste/docker-compose.yml b/docker/centos/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/centos/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/centos/web2py-rocket/Dockerfile b/docker/centos/web2py-rocket/Dockerfile index 89be9ddc..212f84bb 100755 --- a/docker/centos/web2py-rocket/Dockerfile +++ b/docker/centos/web2py-rocket/Dockerfile @@ -1,5 +1,7 @@ FROM centos:latest +#LABEL your_label + RUN yum install -y epel-release && \ yum install -y python python-pip python-setuptools unzip wget --nogpgcheck && \ pip install --upgrade pip && \ diff --git a/docker/centos/web2py-rocket/README.md b/docker/centos/web2py-rocket/README.md index 9f228be0..7bd8836c 100755 --- a/docker/centos/web2py-rocket/README.md +++ b/docker/centos/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Centos/web2py-rocket - docker build -t username/centos-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-rocket username/centos-web2py-rocket + docker build -t your_username/centos-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-rocket your_username/centos-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Centos/web2py-rocket - docker login -u username - docker build -t username/centos-web2py-rocket . - docker push username/centos-web2py-rocket + docker login -u your_username + docker build -t your_username/centos-web2py-rocket . + docker push your_username/centos-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/centos-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-rocket username/centos-web2py-rocket +docker build -t your_username/centos-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-rocket your_username/centos-web2py-rocket docker-compose up -d docker-compose ps diff --git a/docker/centos/web2py-tornado/Dockerfile b/docker/centos/web2py-tornado/Dockerfile index 0f8b5e92..41a52dba 100755 --- a/docker/centos/web2py-tornado/Dockerfile +++ b/docker/centos/web2py-tornado/Dockerfile @@ -1,5 +1,7 @@ FROM centos:latest +#LABEL your_label + RUN yum install -y epel-release && \ yum install -y python python-pip python-setuptools unzip wget python-tornado --nogpgcheck && \ pip install --upgrade pip && \ diff --git a/docker/centos/web2py-tornado/README.md b/docker/centos/web2py-tornado/README.md index 039844c5..96f38c2a 100755 --- a/docker/centos/web2py-tornado/README.md +++ b/docker/centos/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Centos/web2py-tornado - docker build -t username/centos-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-tornado username/centos-web2py-tornado + docker build -t your_username/centos-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-tornado your_username/centos-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Centos/web2py-tornado - docker login -u username - docker build -t username/centos-web2py-tornado . - docker push username/centos-web2py-tornado + docker login -u your_username + docker build -t your_username/centos-web2py-tornado . + docker push your_username/centos-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/centos-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-tornado username/centos-web2py-tornado +docker build -t your_username/centos-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-tornado your_username/centos-web2py-tornado docker-compose up -d docker-compose ps diff --git a/docker/centos/web2py-twisted/Dockerfile b/docker/centos/web2py-twisted/Dockerfile new file mode 100755 index 00000000..df7e65df --- /dev/null +++ b/docker/centos/web2py-twisted/Dockerfile @@ -0,0 +1,28 @@ +FROM centos:latest + +#LABEL your_label + +RUN yum install -y epel-release && \ + yum install -y python python-pip python-setuptools unzip wget python-twisted-web --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s twisted -i 0.0.0.0 -p 8000 diff --git a/docker/centos/web2py-twisted/README.md b/docker/centos/web2py-twisted/README.md new file mode 100755 index 00000000..9dceb39d --- /dev/null +++ b/docker/centos/web2py-twisted/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Centos/web2py-twisted + docker build -t your_username/centos-web2py-twisted . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-twisted your_username/centos-web2py-twisted + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Centos/web2py-twisted + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Centos/web2py-twisted + docker login -u your_username + docker build -t your_username/centos-web2py-twisted . + docker push your_username/centos-web2py-twisted + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/centos-web2py-twisted . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-twisted your_username/centos-web2py-twisted + +docker-compose up -d +docker-compose ps diff --git a/docker/centos/web2py-twisted/docker-compose.yml b/docker/centos/web2py-twisted/docker-compose.yml new file mode 100755 index 00000000..ad47da77 --- /dev/null +++ b/docker/centos/web2py-twisted/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-twisted: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/centos/web2py-waitress/Dockerfile b/docker/centos/web2py-waitress/Dockerfile new file mode 100755 index 00000000..9ffbf233 --- /dev/null +++ b/docker/centos/web2py-waitress/Dockerfile @@ -0,0 +1,28 @@ +FROM centos:latest + +#LABEL your_label + +RUN yum install -y epel-release && \ + yum install -y python python-pip python-setuptools unzip wget python-waitress --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/centos/web2py-waitress/README.md b/docker/centos/web2py-waitress/README.md new file mode 100755 index 00000000..0ce134b1 --- /dev/null +++ b/docker/centos/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Centos/web2py-waitress + docker build -t your_username/centos-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-waitress your_username/centos-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Centos/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Centos/web2py-waitress + docker login -u your_username + docker build -t your_username/centos-web2py-waitress . + docker push your_username/centos-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/centos-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-waitress your_username/centos-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/centos/web2py-waitress/docker-compose.yml b/docker/centos/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/centos/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/centos/web2py-wsgiref/Dockerfile b/docker/centos/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..8d587bbe --- /dev/null +++ b/docker/centos/web2py-wsgiref/Dockerfile @@ -0,0 +1,28 @@ +FROM centos:latest + +#LABEL your_label + +RUN yum install -y epel-release && \ + yum install -y python python-pip python-setuptools unzip wget --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv wsgiref + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/centos/web2py-wsgiref/README.md b/docker/centos/web2py-wsgiref/README.md new file mode 100755 index 00000000..ded7ce62 --- /dev/null +++ b/docker/centos/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Centos/web2py-wsgiref + docker build -t your_username/centos-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-wsgiref your_username/centos-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Centos/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Centos/web2py-wsgiref + docker login -u your_username + docker build -t your_username/centos-web2py-wsgiref . + docker push your_username/centos-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/centos-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name centos-web2py-wsgiref your_username/centos-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/centos/web2py-wsgiref/docker-compose.yml b/docker/centos/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/centos/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-diesel/Dockerfile b/docker/debian/web2py-diesel/Dockerfile new file mode 100755 index 00000000..11bc11bb --- /dev/null +++ b/docker/debian/web2py-diesel/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget && \ + pip install virtualenv diesel + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s diesel -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-diesel/README.md b/docker/debian/web2py-diesel/README.md new file mode 100755 index 00000000..8101260a --- /dev/null +++ b/docker/debian/web2py-diesel/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-diesel + docker build -t your_username/debian-web2py-diesel . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-diesel your_username/debian-web2py-diesel + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-diesel + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-diesel + docker login -u your_username + docker build -t your_username/debian-web2py-diesel . + docker push your_username/debian-web2py-diesel + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-diesel . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-diesel your_username/debian-web2py-diesel + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-diesel/docker-compose.yml b/docker/debian/web2py-diesel/docker-compose.yml new file mode 100755 index 00000000..c7da8b6f --- /dev/null +++ b/docker/debian/web2py-diesel/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-diesel: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-eventlet/Dockerfile b/docker/debian/web2py-eventlet/Dockerfile new file mode 100755 index 00000000..6c2b5826 --- /dev/null +++ b/docker/debian/web2py-eventlet/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-eventlet && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s eventlet -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-eventlet/README.md b/docker/debian/web2py-eventlet/README.md new file mode 100755 index 00000000..e5c4c6c8 --- /dev/null +++ b/docker/debian/web2py-eventlet/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-eventlet + docker build -t your_username/debian-web2py-eventlet . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-eventlet your_username/debian-web2py-eventlet + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-eventlet + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-eventlet + docker login -u your_username + docker build -t your_username/debian-web2py-eventlet . + docker push your_username/debian-web2py-eventlet + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-eventlet . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-eventlet your_username/debian-web2py-eventlet + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-eventlet/docker-compose.yml b/docker/debian/web2py-eventlet/docker-compose.yml new file mode 100755 index 00000000..0191e132 --- /dev/null +++ b/docker/debian/web2py-eventlet/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-eventlet: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-gevent/Dockerfile b/docker/debian/web2py-gevent/Dockerfile new file mode 100755 index 00000000..deaa5432 --- /dev/null +++ b/docker/debian/web2py-gevent/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-gevent && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-gevent/README.md b/docker/debian/web2py-gevent/README.md new file mode 100755 index 00000000..2ff21f51 --- /dev/null +++ b/docker/debian/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-gevent + docker build -t your_username/debian-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-gevent your_username/debian-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-gevent + docker login -u your_username + docker build -t your_username/debian-web2py-gevent . + docker push your_username/debian-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-gevent your_username/debian-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-gevent/docker-compose.yml b/docker/debian/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/debian/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-gunicorn/Dockerfile b/docker/debian/web2py-gunicorn/Dockerfile index 18e3118b..75a34072 100755 --- a/docker/debian/web2py-gunicorn/Dockerfile +++ b/docker/debian/web2py-gunicorn/Dockerfile @@ -1,8 +1,9 @@ FROM debian:latest +#LABEL your_label + RUN apt update && \ - apt install -y python python-pip python-setuptools unzip wget gunicorn && \ - pip install --upgrade pip && \ + apt install -y python python-pip python-setuptools unzip wget python-gunicorn && \ pip install virtualenv RUN groupadd -r web2py && \ diff --git a/docker/debian/web2py-gunicorn/README.md b/docker/debian/web2py-gunicorn/README.md index e256aafc..f1006753 100755 --- a/docker/debian/web2py-gunicorn/README.md +++ b/docker/debian/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Debian/web2py-gunicorn - docker build -t username/debian-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-gunicorn username/debian-web2py-gunicorn + docker build -t your_username/debian-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-gunicorn your_username/debian-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Debian/web2py-gunicorn - docker login -u username - docker build -t username/debian-web2py-gunicorn . - docker push username/debian-web2py-gunicorn + docker login -u your_username + docker build -t your_username/debian-web2py-gunicorn . + docker push your_username/debian-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/debian-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-gunicorn username/debian-web2py-gunicorn +docker build -t your_username/debian-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-gunicorn your_username/debian-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/debian/web2py-paste/Dockerfile b/docker/debian/web2py-paste/Dockerfile new file mode 100755 index 00000000..413391be --- /dev/null +++ b/docker/debian/web2py-paste/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-paste && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-paste/README.md b/docker/debian/web2py-paste/README.md new file mode 100755 index 00000000..b97d1ddf --- /dev/null +++ b/docker/debian/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-paste + docker build -t your_username/debian-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-paste your_username/debian-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-paste + docker login -u your_username + docker build -t your_username/debian-web2py-paste . + docker push your_username/debian-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-paste your_username/debian-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-paste/docker-compose.yml b/docker/debian/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/debian/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-rocket/Dockerfile b/docker/debian/web2py-rocket/Dockerfile index a43c1356..802491cc 100755 --- a/docker/debian/web2py-rocket/Dockerfile +++ b/docker/debian/web2py-rocket/Dockerfile @@ -1,5 +1,7 @@ FROM debian:latest +#LABEL your_label + RUN apt update && \ apt install -y python python-pip python-setuptools unzip wget && \ pip install --upgrade pip && \ diff --git a/docker/debian/web2py-rocket/README.md b/docker/debian/web2py-rocket/README.md index 053fed18..f937cf3a 100755 --- a/docker/debian/web2py-rocket/README.md +++ b/docker/debian/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Debian/web2py-rocket - docker build -t username/debian-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-rocket username/debian-web2py-rocket + docker build -t your_username/debian-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-rocket your_username/debian-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Debian/web2py-rocket - docker login -u username - docker build -t username/debian-web2py-rocket . - docker push username/debian-web2py-rocket + docker login -u your_username + docker build -t your_username/debian-web2py-rocket . + docker push your_username/debian-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/debian-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-rocket username/debian-web2py-rocket +docker build -t your_username/debian-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-rocket your_username/debian-web2py-rocket docker-compose up -d docker-compose ps diff --git a/docker/debian/web2py-tornado/Dockerfile b/docker/debian/web2py-tornado/Dockerfile index 2f1611a1..51d6da88 100755 --- a/docker/debian/web2py-tornado/Dockerfile +++ b/docker/debian/web2py-tornado/Dockerfile @@ -1,8 +1,9 @@ FROM debian:latest +#LABEL your_label + RUN apt update && \ apt install -y python python-pip python-setuptools unzip wget python-tornado && \ - pip install --upgrade pip && \ pip install virtualenv RUN groupadd -r web2py && \ diff --git a/docker/debian/web2py-tornado/README.md b/docker/debian/web2py-tornado/README.md index 17ed63e4..f8dcaae7 100755 --- a/docker/debian/web2py-tornado/README.md +++ b/docker/debian/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Debian/web2py-tornado - docker build -t username/debian-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-tornado username/debian-web2py-tornado + docker build -t your_username/debian-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-tornado your_username/debian-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Debian/web2py-tornado - docker login -u username - docker build -t username/debian-web2py-tornado . - docker push username/debian-web2py-tornado + docker login -u your_username + docker build -t your_username/debian-web2py-tornado . + docker push your_username/debian-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/debian-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-tornado username/debian-web2py-tornado +docker build -t your_username/debian-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-tornado your_username/debian-web2py-tornado docker-compose up -d docker-compose ps diff --git a/docker/debian/web2py-twisted/Dockerfile b/docker/debian/web2py-twisted/Dockerfile new file mode 100755 index 00000000..e5716563 --- /dev/null +++ b/docker/debian/web2py-twisted/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-twisted && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s twisted -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-twisted/README.md b/docker/debian/web2py-twisted/README.md new file mode 100755 index 00000000..ab4efcb3 --- /dev/null +++ b/docker/debian/web2py-twisted/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-twisted + docker build -t your_username/debian-web2py-twisted . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-twisted your_username/debian-web2py-twisted + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-twisted + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-twisted + docker login -u your_username + docker build -t your_username/debian-web2py-twisted . + docker push your_username/debian-web2py-twisted + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-twisted . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-twisted your_username/debian-web2py-twisted + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-twisted/docker-compose.yml b/docker/debian/web2py-twisted/docker-compose.yml new file mode 100755 index 00000000..ad47da77 --- /dev/null +++ b/docker/debian/web2py-twisted/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-twisted: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-waitress/Dockerfile b/docker/debian/web2py-waitress/Dockerfile new file mode 100755 index 00000000..1be3032c --- /dev/null +++ b/docker/debian/web2py-waitress/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget && \ + pip install virtualenv waitress + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-waitress/README.md b/docker/debian/web2py-waitress/README.md new file mode 100755 index 00000000..59e57e80 --- /dev/null +++ b/docker/debian/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-waitress + docker build -t your_username/debian-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-waitress your_username/debian-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-waitress + docker login -u your_username + docker build -t your_username/debian-web2py-waitress . + docker push your_username/debian-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-waitress your_username/debian-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-waitress/docker-compose.yml b/docker/debian/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/debian/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/debian/web2py-wsgiref/Dockerfile b/docker/debian/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..d695bda4 --- /dev/null +++ b/docker/debian/web2py-wsgiref/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget && \ + pip install virtualenv wsgiref + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/debian/web2py-wsgiref/README.md b/docker/debian/web2py-wsgiref/README.md new file mode 100755 index 00000000..65e47088 --- /dev/null +++ b/docker/debian/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Debian/web2py-wsgiref + docker build -t your_username/debian-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-wsgiref your_username/debian-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Debian/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Debian/web2py-wsgiref + docker login -u your_username + docker build -t your_username/debian-web2py-wsgiref . + docker push your_username/debian-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/debian-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name debian-web2py-wsgiref your_username/debian-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/debian/web2py-wsgiref/docker-compose.yml b/docker/debian/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/debian/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/fedora/web2py-eventlet/Dockerfile b/docker/fedora/web2py-eventlet/Dockerfile new file mode 100755 index 00000000..ec4d1e3c --- /dev/null +++ b/docker/fedora/web2py-eventlet/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +#LABEL your_label + +RUN dnf install -y python python-pip python-setuptools unzip wget python-eventlet --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s eventlet -i 0.0.0.0 -p 8000 diff --git a/docker/fedora/web2py-eventlet/README.md b/docker/fedora/web2py-eventlet/README.md new file mode 100755 index 00000000..01c2e739 --- /dev/null +++ b/docker/fedora/web2py-eventlet/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Fedora/web2py-eventlet + docker build -t your_username/fedora-web2py-eventlet . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-eventlet your_username/fedora-web2py-eventlet + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Fedora/web2py-eventlet + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Fedora/web2py-eventlet + docker login -u your_username + docker build -t your_username/fedora-web2py-eventlet . + docker push your_username/fedora-web2py-eventlet + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/fedora-web2py-eventlet . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-eventlet your_username/fedora-web2py-eventlet + +docker-compose up -d +docker-compose ps diff --git a/docker/fedora/web2py-eventlet/docker-compose.yml b/docker/fedora/web2py-eventlet/docker-compose.yml new file mode 100755 index 00000000..0191e132 --- /dev/null +++ b/docker/fedora/web2py-eventlet/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-eventlet: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/fedora/web2py-gevent/Dockerfile b/docker/fedora/web2py-gevent/Dockerfile new file mode 100755 index 00000000..fcf282a1 --- /dev/null +++ b/docker/fedora/web2py-gevent/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +#LABEL your_label + +RUN dnf install -y python python-pip python-setuptools unzip wget python-gevent --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/fedora/web2py-gevent/README.md b/docker/fedora/web2py-gevent/README.md new file mode 100755 index 00000000..de26b99b --- /dev/null +++ b/docker/fedora/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Fedora/web2py-gevent + docker build -t your_username/fedora-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-gevent your_username/fedora-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Fedora/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Fedora/web2py-gevent + docker login -u your_username + docker build -t your_username/fedora-web2py-gevent . + docker push your_username/fedora-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/fedora-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-gevent your_username/fedora-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/fedora/web2py-gevent/docker-compose.yml b/docker/fedora/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/fedora/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/fedora/web2py-gunicorn/Dockerfile b/docker/fedora/web2py-gunicorn/Dockerfile index a226b4b9..1fed71dd 100755 --- a/docker/fedora/web2py-gunicorn/Dockerfile +++ b/docker/fedora/web2py-gunicorn/Dockerfile @@ -1,5 +1,7 @@ FROM fedora:latest +#LABEL your_label + RUN dnf install -y python python-pip python-setuptools unzip wget python-gunicorn --nogpgcheck && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/fedora/web2py-gunicorn/README.md b/docker/fedora/web2py-gunicorn/README.md index 53a92b29..b8f49616 100755 --- a/docker/fedora/web2py-gunicorn/README.md +++ b/docker/fedora/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Fedora/web2py-gunicorn - docker build -t username/fedora-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-gunicorn username/fedora-web2py-gunicorn + docker build -t your_username/fedora-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-gunicorn your_username/fedora-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Fedora/web2py-gunicorn - docker login -u username - docker build -t username/fedora-web2py-gunicorn . - docker push username/fedora-web2py-gunicorn + docker login -u your_username + docker build -t your_username/fedora-web2py-gunicorn . + docker push your_username/fedora-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/fedora-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-gunicorn username/fedora-web2py-gunicorn +docker build -t your_username/fedora-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-gunicorn your_username/fedora-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/fedora/web2py-paste/Dockerfile b/docker/fedora/web2py-paste/Dockerfile new file mode 100755 index 00000000..9dc0a3b4 --- /dev/null +++ b/docker/fedora/web2py-paste/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +#LABEL your_label + +RUN dnf install -y python python-pip python-setuptools unzip wget python-paste --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/fedora/web2py-paste/README.md b/docker/fedora/web2py-paste/README.md new file mode 100755 index 00000000..265b4752 --- /dev/null +++ b/docker/fedora/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Fedora/web2py-paste + docker build -t your_username/fedora-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-paste your_username/fedora-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Fedora/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Fedora/web2py-paste + docker login -u your_username + docker build -t your_username/fedora-web2py-paste . + docker push your_username/fedora-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/fedora-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-paste your_username/fedora-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/fedora/web2py-paste/docker-compose.yml b/docker/fedora/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/fedora/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/fedora/web2py-rocket/Dockerfile b/docker/fedora/web2py-rocket/Dockerfile index 1e049d2f..3fa20078 100755 --- a/docker/fedora/web2py-rocket/Dockerfile +++ b/docker/fedora/web2py-rocket/Dockerfile @@ -1,5 +1,7 @@ FROM fedora:latest +#LABEL your_label + RUN dnf install -y python python-pip python-setuptools unzip wget --nogpgcheck && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/fedora/web2py-rocket/README.md b/docker/fedora/web2py-rocket/README.md index 7bd85197..0c9497c5 100755 --- a/docker/fedora/web2py-rocket/README.md +++ b/docker/fedora/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Fedora/web2py-rocket - docker build -t username/fedora-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-rocket username/fedora-web2py-rocket + docker build -t your_username/fedora-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-rocket your_username/fedora-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Fedora/web2py-rocket - docker login -u username - docker build -t username/fedora-web2py-rocket . - docker push username/fedora-web2py-rocket + docker login -u your_username + docker build -t your_username/fedora-web2py-rocket . + docker push your_username/fedora-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/fedora-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-rocket username/fedora-web2py-rocket +docker build -t your_username/fedora-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-rocket your_username/fedora-web2py-rocket docker-compose up -d docker-compose ps diff --git a/docker/fedora/web2py-tornado/Dockerfile b/docker/fedora/web2py-tornado/Dockerfile index 9cb63d9a..160f4a0d 100755 --- a/docker/fedora/web2py-tornado/Dockerfile +++ b/docker/fedora/web2py-tornado/Dockerfile @@ -1,5 +1,7 @@ FROM fedora:latest +#LABEL your_label + RUN dnf install -y python python-pip python-setuptools unzip wget python-tornado --nogpgcheck && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/fedora/web2py-tornado/README.md b/docker/fedora/web2py-tornado/README.md index e3181951..fa7f4cf1 100755 --- a/docker/fedora/web2py-tornado/README.md +++ b/docker/fedora/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Fedora/web2py-tornado - docker build -t username/fedora-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-tornado username/fedora-web2py-tornado + docker build -t your_username/fedora-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-tornado your_username/fedora-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Fedora/web2py-tornado - docker login -u username - docker build -t username/fedora-web2py-tornado . - docker push username/fedora-web2py-tornado + docker login -u your_username + docker build -t your_username/fedora-web2py-tornado . + docker push your_username/fedora-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/fedora-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-tornado username/fedora-web2py-tornado +docker build -t your_username/fedora-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-tornado your_username/fedora-web2py-tornado docker-compose up -d docker-compose ps diff --git a/docker/fedora/web2py-twisted/Dockerfile b/docker/fedora/web2py-twisted/Dockerfile new file mode 100755 index 00000000..40ddd0fb --- /dev/null +++ b/docker/fedora/web2py-twisted/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +#LABEL your_label + +RUN dnf install -y python python-pip python-setuptools unzip wget python-twisted --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s twisted -i 0.0.0.0 -p 8000 diff --git a/docker/fedora/web2py-twisted/README.md b/docker/fedora/web2py-twisted/README.md new file mode 100755 index 00000000..d003cb2e --- /dev/null +++ b/docker/fedora/web2py-twisted/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Fedora/web2py-twisted + docker build -t your_username/fedora-web2py-twisted . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-twisted your_username/fedora-web2py-twisted + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Fedora/web2py-twisted + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Fedora/web2py-twisted + docker login -u your_username + docker build -t your_username/fedora-web2py-twisted . + docker push your_username/fedora-web2py-twisted + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/fedora-web2py-twisted . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-twisted your_username/fedora-web2py-twisted + +docker-compose up -d +docker-compose ps diff --git a/docker/fedora/web2py-twisted/docker-compose.yml b/docker/fedora/web2py-twisted/docker-compose.yml new file mode 100755 index 00000000..ad47da77 --- /dev/null +++ b/docker/fedora/web2py-twisted/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-twisted: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/fedora/web2py-waitress/Dockerfile b/docker/fedora/web2py-waitress/Dockerfile new file mode 100755 index 00000000..584c829e --- /dev/null +++ b/docker/fedora/web2py-waitress/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +#LABEL your_label + +RUN dnf install -y python python-pip python-setuptools unzip wget python-waitress --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/fedora/web2py-waitress/README.md b/docker/fedora/web2py-waitress/README.md new file mode 100755 index 00000000..35cf092b --- /dev/null +++ b/docker/fedora/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Fedora/web2py-waitress + docker build -t your_username/fedora-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-waitress your_username/fedora-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Fedora/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Fedora/web2py-waitress + docker login -u your_username + docker build -t your_username/fedora-web2py-waitress . + docker push your_username/fedora-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/fedora-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-waitress your_username/fedora-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/fedora/web2py-waitress/docker-compose.yml b/docker/fedora/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/fedora/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/fedora/web2py-wsgiref/Dockerfile b/docker/fedora/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..3afd3eec --- /dev/null +++ b/docker/fedora/web2py-wsgiref/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:latest + +#LABEL your_label + +RUN dnf install -y python python-pip python-setuptools unzip wget --nogpgcheck && \ + pip install --upgrade pip && \ + pip install virtualenv wsgiref + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/fedora/web2py-wsgiref/README.md b/docker/fedora/web2py-wsgiref/README.md new file mode 100755 index 00000000..ff474946 --- /dev/null +++ b/docker/fedora/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Fedora/web2py-wsgiref + docker build -t your_username/fedora-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-wsgiref your_username/fedora-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Fedora/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Fedora/web2py-wsgiref + docker login -u your_username + docker build -t your_username/fedora-web2py-wsgiref . + docker push your_username/fedora-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/fedora-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name fedora-web2py-wsgiref your_username/fedora-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/fedora/web2py-wsgiref/docker-compose.yml b/docker/fedora/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/fedora/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/opensuse/web2py-eventlet/Dockerfile b/docker/opensuse/web2py-eventlet/Dockerfile new file mode 100755 index 00000000..6ec48958 --- /dev/null +++ b/docker/opensuse/web2py-eventlet/Dockerfile @@ -0,0 +1,27 @@ +FROM opensuse:latest + +#LABEL your_label + +RUN zypper in -y python python-pip python-setuptools unzip wget python-eventlet && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s eventlet -i 0.0.0.0 -p 8000 diff --git a/docker/opensuse/web2py-eventlet/README.md b/docker/opensuse/web2py-eventlet/README.md new file mode 100755 index 00000000..356efa46 --- /dev/null +++ b/docker/opensuse/web2py-eventlet/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/OpenSuse/web2py-eventlet + docker build -t your_username/opensuse-web2py-eventlet . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-eventlet your_username/opensuse-web2py-eventlet + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/OpenSuse/web2py-eventlet + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/OpenSuse/web2py-eventlet + docker login -u your_username + docker build -t your_username/opensuse-web2py-eventlet . + docker push your_username/opensuse-web2py-eventlet + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/opensuse-web2py-eventlet . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-eventlet your_username/opensuse-web2py-eventlet + +docker-compose up -d +docker-compose ps diff --git a/docker/opensuse/web2py-eventlet/docker-compose.yml b/docker/opensuse/web2py-eventlet/docker-compose.yml new file mode 100755 index 00000000..0191e132 --- /dev/null +++ b/docker/opensuse/web2py-eventlet/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-eventlet: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/opensuse/web2py-gevent/Dockerfile b/docker/opensuse/web2py-gevent/Dockerfile new file mode 100755 index 00000000..dfbf9ade --- /dev/null +++ b/docker/opensuse/web2py-gevent/Dockerfile @@ -0,0 +1,27 @@ +FROM opensuse:latest + +#LABEL your_label + +RUN zypper in -y python python-pip python-setuptools unzip wget python-gevent && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/opensuse/web2py-gevent/README.md b/docker/opensuse/web2py-gevent/README.md new file mode 100755 index 00000000..3b737a34 --- /dev/null +++ b/docker/opensuse/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/OpenSuse/web2py-gevent + docker build -t your_username/opensuse-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-gevent your_username/opensuse-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/OpenSuse/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/OpenSuse/web2py-gevent + docker login -u your_username + docker build -t your_username/opensuse-web2py-gevent . + docker push your_username/opensuse-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/opensuse-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-gevent your_username/opensuse-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/opensuse/web2py-gevent/docker-compose.yml b/docker/opensuse/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/opensuse/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/opensuse/web2py-gunicorn/Dockerfile b/docker/opensuse/web2py-gunicorn/Dockerfile index 4bf4c0b4..d7887582 100755 --- a/docker/opensuse/web2py-gunicorn/Dockerfile +++ b/docker/opensuse/web2py-gunicorn/Dockerfile @@ -1,5 +1,7 @@ FROM opensuse:latest +#LABEL your_label + RUN zypper in -y python python-pip python-setuptools unzip wget python-gunicorn && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/opensuse/web2py-gunicorn/README.md b/docker/opensuse/web2py-gunicorn/README.md index 0143eed7..97ab6f92 100755 --- a/docker/opensuse/web2py-gunicorn/README.md +++ b/docker/opensuse/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/OpenSuse/web2py-gunicorn - docker build -t username/opensuse-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-gunicorn username/opensuse-web2py-gunicorn + docker build -t your_username/opensuse-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-gunicorn your_username/opensuse-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/OpenSuse/web2py-gunicorn - docker login -u username - docker build -t username/opensuse-web2py-gunicorn . - docker push username/opensuse-web2py-gunicorn + docker login -u your_username + docker build -t your_username/opensuse-web2py-gunicorn . + docker push your_username/opensuse-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/opensuse-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-gunicorn username/opensuse-web2py-gunicorn +docker build -t your_username/opensuse-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-gunicorn your_username/opensuse-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/opensuse/web2py-paste/Dockerfile b/docker/opensuse/web2py-paste/Dockerfile new file mode 100755 index 00000000..331ae427 --- /dev/null +++ b/docker/opensuse/web2py-paste/Dockerfile @@ -0,0 +1,27 @@ +FROM opensuse:latest + +#LABEL your_label + +RUN zypper in -y python python-pip python-setuptools unzip wget python-paste && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/opensuse/web2py-paste/README.md b/docker/opensuse/web2py-paste/README.md new file mode 100755 index 00000000..df8ae5e7 --- /dev/null +++ b/docker/opensuse/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/OpenSuse/web2py-paste + docker build -t your_username/opensuse-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-paste your_username/opensuse-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/OpenSuse/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/OpenSuse/web2py-paste + docker login -u your_username + docker build -t your_username/opensuse-web2py-paste . + docker push your_username/opensuse-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/opensuse-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-paste your_username/opensuse-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/opensuse/web2py-paste/docker-compose.yml b/docker/opensuse/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/opensuse/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/opensuse/web2py-rocket/Dockerfile b/docker/opensuse/web2py-rocket/Dockerfile index 2d3711c7..a8fca1e2 100755 --- a/docker/opensuse/web2py-rocket/Dockerfile +++ b/docker/opensuse/web2py-rocket/Dockerfile @@ -1,5 +1,7 @@ FROM opensuse:latest +#LABEL your_label + RUN zypper in -y python python-pip python-setuptools unzip wget && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/opensuse/web2py-rocket/README.md b/docker/opensuse/web2py-rocket/README.md index 7136bd51..a18e5ab5 100755 --- a/docker/opensuse/web2py-rocket/README.md +++ b/docker/opensuse/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/OpenSuse/web2py-rocket - docker build -t username/opensuse-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-rocket username/opensuse-web2py-rocket + docker build -t your_username/opensuse-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-rocket your_username/opensuse-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/OpenSuse/web2py-rocket - docker login -u username - docker build -t username/opensuse-web2py-rocket . - docker push username/opensuse-web2py-rocket + docker login -u your_username + docker build -t your_username/opensuse-web2py-rocket . + docker push your_username/opensuse-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/opensuse-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-rocket username/opensuse-web2py-rocket +docker build -t your_username/opensuse-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-rocket your_username/opensuse-web2py-rocket docker-compose up -d docker-compose ps diff --git a/docker/opensuse/web2py-tornado/Dockerfile b/docker/opensuse/web2py-tornado/Dockerfile index 66d429bd..55cf5a25 100755 --- a/docker/opensuse/web2py-tornado/Dockerfile +++ b/docker/opensuse/web2py-tornado/Dockerfile @@ -1,5 +1,7 @@ FROM opensuse:latest +#LABEL your_label + RUN zypper in -y python python-pip python-setuptools unzip wget python-tornado && \ pip install --upgrade pip && \ pip install virtualenv diff --git a/docker/opensuse/web2py-tornado/README.md b/docker/opensuse/web2py-tornado/README.md index 604b6891..10f4ac6d 100755 --- a/docker/opensuse/web2py-tornado/README.md +++ b/docker/opensuse/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/OpenSuse/web2py-tornado - docker build -t username/opensuse-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-tornado username/opensuse-web2py-tornado + docker build -t your_username/opensuse-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-tornado your_username/opensuse-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/OpenSuse/web2py-tornado - docker login -u username - docker build -t username/opensuse-web2py-tornado . - docker push username/opensuse-web2py-tornado + docker login -u your_username + docker build -t your_username/opensuse-web2py-tornado . + docker push your_username/opensuse-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/opensuse-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-tornado username/opensuse-web2py-tornado +docker build -t your_username/opensuse-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-tornado your_username/opensuse-web2py-tornado docker-compose up -d docker-compose ps diff --git a/docker/opensuse/web2py-twisted/Dockerfile b/docker/opensuse/web2py-twisted/Dockerfile new file mode 100755 index 00000000..a9ac3678 --- /dev/null +++ b/docker/opensuse/web2py-twisted/Dockerfile @@ -0,0 +1,27 @@ +FROM opensuse:latest + +#LABEL your_label + +RUN zypper in -y python python-pip python-setuptools unzip wget python-twisted && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s twisted -i 0.0.0.0 -p 8000 diff --git a/docker/opensuse/web2py-twisted/README.md b/docker/opensuse/web2py-twisted/README.md new file mode 100755 index 00000000..4e12086c --- /dev/null +++ b/docker/opensuse/web2py-twisted/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/OpenSuse/web2py-twisted + docker build -t your_username/opensuse-web2py-twisted . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-twisted your_username/opensuse-web2py-twisted + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/OpenSuse/web2py-twisted + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/OpenSuse/web2py-twisted + docker login -u your_username + docker build -t your_username/opensuse-web2py-twisted . + docker push your_username/opensuse-web2py-twisted + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/opensuse-web2py-twisted . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-twisted your_username/opensuse-web2py-twisted + +docker-compose up -d +docker-compose ps diff --git a/docker/opensuse/web2py-twisted/docker-compose.yml b/docker/opensuse/web2py-twisted/docker-compose.yml new file mode 100755 index 00000000..ad47da77 --- /dev/null +++ b/docker/opensuse/web2py-twisted/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-twisted: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/opensuse/web2py-waitress/Dockerfile b/docker/opensuse/web2py-waitress/Dockerfile new file mode 100755 index 00000000..34834836 --- /dev/null +++ b/docker/opensuse/web2py-waitress/Dockerfile @@ -0,0 +1,27 @@ +FROM opensuse:latest + +#LABEL your_label + +RUN zypper in -y python python-pip python-setuptools unzip wget python-waitress && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/opensuse/web2py-waitress/README.md b/docker/opensuse/web2py-waitress/README.md new file mode 100755 index 00000000..87a70d09 --- /dev/null +++ b/docker/opensuse/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/OpenSuse/web2py-waitress + docker build -t your_username/opensuse-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-waitress your_username/opensuse-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/OpenSuse/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/OpenSuse/web2py-waitress + docker login -u your_username + docker build -t your_username/opensuse-web2py-waitress . + docker push your_username/opensuse-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/opensuse-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-waitress your_username/opensuse-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/opensuse/web2py-waitress/docker-compose.yml b/docker/opensuse/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/opensuse/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/opensuse/web2py-wsgiref/Dockerfile b/docker/opensuse/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..3d8cfce3 --- /dev/null +++ b/docker/opensuse/web2py-wsgiref/Dockerfile @@ -0,0 +1,27 @@ +FROM opensuse:latest + +#LABEL your_label + +RUN zypper in -y python python-pip python-setuptools unzip wget python-wsgiref && \ + pip install --upgrade pip && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/opensuse/web2py-wsgiref/README.md b/docker/opensuse/web2py-wsgiref/README.md new file mode 100755 index 00000000..dae37bed --- /dev/null +++ b/docker/opensuse/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/OpenSuse/web2py-wsgiref + docker build -t your_username/opensuse-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-wsgiref your_username/opensuse-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/OpenSuse/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/OpenSuse/web2py-wsgiref + docker login -u your_username + docker build -t your_username/opensuse-web2py-wsgiref . + docker push your_username/opensuse-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/opensuse-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name opensuse-web2py-wsgiref your_username/opensuse-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/opensuse/web2py-wsgiref/docker-compose.yml b/docker/opensuse/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/opensuse/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/python/web2py-diesel/Dockerfile b/docker/python/web2py-diesel/Dockerfile new file mode 100755 index 00000000..a8d03504 --- /dev/null +++ b/docker/python/web2py-diesel/Dockerfile @@ -0,0 +1,25 @@ +FROM python:2.7 + +#LABEL your_label + +RUN apt update && \ + apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ + pip install diesel + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN cd /home/web2py/ && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD python /home/web2py/web2py/anyserver.py -s diesel -i 0.0.0.0 -p 8000 diff --git a/docker/python/web2py-diesel/README.md b/docker/python/web2py-diesel/README.md new file mode 100755 index 00000000..bff91e63 --- /dev/null +++ b/docker/python/web2py-diesel/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/App/web2py-diesel + docker build -t your_username/app-web2py-diesel . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-diesel your_username/app-web2py-diesel + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/App/web2py-diesel + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/App/web2py-diesel + docker login -u your_username + docker build -t your_username/app-web2py-diesel . + docker push your_username/app-web2py-diesel + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/app-web2py-diesel . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-diesel your_username/app-web2py-diesel + +docker-compose up -d +docker-compose ps diff --git a/docker/python/web2py-diesel/docker-compose.yml b/docker/python/web2py-diesel/docker-compose.yml new file mode 100755 index 00000000..c7da8b6f --- /dev/null +++ b/docker/python/web2py-diesel/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-diesel: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/python/web2py-gevent/Dockerfile b/docker/python/web2py-gevent/Dockerfile new file mode 100755 index 00000000..498d1567 --- /dev/null +++ b/docker/python/web2py-gevent/Dockerfile @@ -0,0 +1,25 @@ +FROM python:2.7 + +#LABEL your_label + +RUN apt update && \ + apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ + pip install gevent + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN cd /home/web2py/ && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/python/web2py-gevent/README.md b/docker/python/web2py-gevent/README.md new file mode 100755 index 00000000..c6f4063f --- /dev/null +++ b/docker/python/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/App/web2py-gevent + docker build -t your_username/app-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-gevent your_username/app-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/App/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/App/web2py-gevent + docker login -u your_username + docker build -t your_username/app-web2py-gevent . + docker push your_username/app-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/app-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-gevent your_username/app-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/python/web2py-gevent/docker-compose.yml b/docker/python/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/python/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/python/web2py-gunicorn/Dockerfile b/docker/python/web2py-gunicorn/Dockerfile index 91f3c658..3d20555e 100755 --- a/docker/python/web2py-gunicorn/Dockerfile +++ b/docker/python/web2py-gunicorn/Dockerfile @@ -1,7 +1,10 @@ FROM python:2.7 +#LABEL your_label + RUN apt update && \ apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ pip install gunicorn RUN groupadd -r web2py && \ diff --git a/docker/python/web2py-gunicorn/README.md b/docker/python/web2py-gunicorn/README.md index 2554d28f..688395bf 100755 --- a/docker/python/web2py-gunicorn/README.md +++ b/docker/python/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/App/web2py-gunicorn - docker build -t username/app-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-gunicorn username/app-web2py-gunicorn + docker build -t your_username/app-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-gunicorn your_username/app-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/App/web2py-gunicorn - docker login -u username - docker build -t username/app-web2py-gunicorn . - docker push username/app-web2py-gunicorn + docker login -u your_username + docker build -t your_username/app-web2py-gunicorn . + docker push your_username/app-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/app-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-gunicorn username/app-web2py-gunicorn +docker build -t your_username/app-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-gunicorn your_username/app-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/python/web2py-paste/Dockerfile b/docker/python/web2py-paste/Dockerfile new file mode 100755 index 00000000..20a1bc2e --- /dev/null +++ b/docker/python/web2py-paste/Dockerfile @@ -0,0 +1,25 @@ +FROM python:2.7 + +#LABEL your_label + +RUN apt update && \ + apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ + pip install paste + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN cd /home/web2py/ && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/python/web2py-paste/README.md b/docker/python/web2py-paste/README.md new file mode 100755 index 00000000..1ffbd963 --- /dev/null +++ b/docker/python/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/App/web2py-paste + docker build -t your_username/app-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-paste your_username/app-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/App/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/App/web2py-paste + docker login -u your_username + docker build -t your_username/app-web2py-paste . + docker push your_username/app-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/app-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-paste your_username/app-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/python/web2py-paste/docker-compose.yml b/docker/python/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/python/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/python/web2py-rocket-ssl/Dockerfile b/docker/python/web2py-rocket-ssl/Dockerfile index 204df23f..9308ca4b 100755 --- a/docker/python/web2py-rocket-ssl/Dockerfile +++ b/docker/python/web2py-rocket-ssl/Dockerfile @@ -1,5 +1,7 @@ FROM python:2.7 +#LABEL your_label + RUN apt update && \ apt install -y unzip wget @@ -8,7 +10,7 @@ RUN wget -c http://web2py.com/examples/static/web2py_src.zip && \ rm -rf /web2py/applications/examples && \ cd /web2py && \ openssl genrsa 1024 > web2py.key && chmod 400 web2py.key && \ - openssl req -new -x509 -nodes -sha1 -days 1780 -subj '/C=c/ST=st/L=l/O=o/OU=ou/CN=cn.com' -key web2py.key > web2py.crt && \ + openssl req -new -x509 -nodes -sha1 -days 1780 -subj '/C=ID/ST=Jakarta/L=Jakarta/O=stifix/OU=IT/CN=stifix.com' -key web2py.key > web2py.crt && \ openssl x509 -noout -fingerprint -text < web2py.crt > web2py.info && \ chmod 755 -R /web2py diff --git a/docker/python/web2py-rocket-ssl/README.md b/docker/python/web2py-rocket-ssl/README.md index 623c6c87..5689e465 100755 --- a/docker/python/web2py-rocket-ssl/README.md +++ b/docker/python/web2py-rocket-ssl/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/App/web2py-rocket-ssl - docker build -t username/app-web2py-rocket-ssl . - docker run -d -v applications:/web2py/applications -p 443:443 --name app-web2py-rocket-ssl username/app-web2py-rocket-ssl + docker build -t your_username/app-web2py-rocket-ssl . + docker run -d -v applications:/web2py/applications -p 443:443 --name app-web2py-rocket-ssl your_username/app-web2py-rocket-ssl docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/App/web2py-rocket-ssl - docker login -u username - docker build -t username/app-web2py-rocket-ssl . - docker push username/app-web2py-rocket-ssl + docker login -u your_username + docker build -t your_username/app-web2py-rocket-ssl . + docker push your_username/app-web2py-rocket-ssl # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/app-web2py-rocket-ssl . -docker run -d -v applications:/web2py/applications -p 443:443 --name app-web2py-rocket-ssl username/app-web2py-rocket-ssl +docker build -t your_username/app-web2py-rocket-ssl . +docker run -d -v applications:/web2py/applications -p 443:443 --name app-web2py-rocket-ssl your_username/app-web2py-rocket-ssl docker-compose up -d docker-compose ps diff --git a/docker/python/web2py-rocket/Dockerfile b/docker/python/web2py-rocket/Dockerfile index f23bc327..28058453 100755 --- a/docker/python/web2py-rocket/Dockerfile +++ b/docker/python/web2py-rocket/Dockerfile @@ -1,5 +1,7 @@ FROM python:2.7 +#LABEL your_label + RUN apt update && \ apt install -y unzip wget diff --git a/docker/python/web2py-rocket/README.md b/docker/python/web2py-rocket/README.md index 044f4a8b..6f383e4c 100755 --- a/docker/python/web2py-rocket/README.md +++ b/docker/python/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/App/web2py-rocket - docker build -t username/app-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-rocket username/app-web2py-rocket + docker build -t your_username/app-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-rocket your_username/app-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/App/web2py-rocket - docker login -u username - docker build -t username/app-web2py-rocket . - docker push username/app-web2py-rocket + docker login -u your_username + docker build -t your_username/app-web2py-rocket . + docker push your_username/app-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/app-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-rocket username/app-web2py-rocket +docker build -t your_username/app-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-rocket your_username/app-web2py-rocket docker-compose up -d docker-compose ps diff --git a/docker/python/web2py-tornado/Dockerfile b/docker/python/web2py-tornado/Dockerfile index 0fbd26c9..7671026d 100755 --- a/docker/python/web2py-tornado/Dockerfile +++ b/docker/python/web2py-tornado/Dockerfile @@ -1,7 +1,10 @@ FROM python:2.7 +#LABEL your_label + RUN apt update && \ apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ pip install tornado RUN groupadd -r web2py && \ diff --git a/docker/python/web2py-tornado/README.md b/docker/python/web2py-tornado/README.md index a4032343..b0fb2f34 100755 --- a/docker/python/web2py-tornado/README.md +++ b/docker/python/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/App/web2py-tornado - docker build -t username/app-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-tornado username/app-web2py-tornado + docker build -t your_username/app-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-tornado your_username/app-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/App/web2py-tornado - docker login -u username - docker build -t username/app-web2py-tornado . - docker push username/app-web2py-tornado + docker login -u your_username + docker build -t your_username/app-web2py-tornado . + docker push your_username/app-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/app-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-tornado username/app-web2py-tornado +docker build -t your_username/app-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-tornado your_username/app-web2py-tornado docker-compose up -d docker-compose ps diff --git a/docker/python/web2py-twisted/Dockerfile b/docker/python/web2py-twisted/Dockerfile new file mode 100755 index 00000000..649ad3ba --- /dev/null +++ b/docker/python/web2py-twisted/Dockerfile @@ -0,0 +1,25 @@ +FROM python:2.7 + +#LABEL your_label + +RUN apt update && \ + apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ + pip install twisted + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN cd /home/web2py/ && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD python /home/web2py/web2py/anyserver.py -s twisted -i 0.0.0.0 -p 8000 diff --git a/docker/python/web2py-twisted/README.md b/docker/python/web2py-twisted/README.md new file mode 100755 index 00000000..b9ae452a --- /dev/null +++ b/docker/python/web2py-twisted/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/App/web2py-twisted + docker build -t your_username/app-web2py-twisted . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-twisted your_username/app-web2py-twisted + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/App/web2py-twisted + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/App/web2py-twisted + docker login -u your_username + docker build -t your_username/app-web2py-twisted . + docker push your_username/app-web2py-twisted + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/app-web2py-twisted . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-twisted your_username/app-web2py-twisted + +docker-compose up -d +docker-compose ps diff --git a/docker/python/web2py-twisted/docker-compose.yml b/docker/python/web2py-twisted/docker-compose.yml new file mode 100755 index 00000000..ad47da77 --- /dev/null +++ b/docker/python/web2py-twisted/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-twisted: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/python/web2py-waitress/Dockerfile b/docker/python/web2py-waitress/Dockerfile new file mode 100755 index 00000000..7fa2b789 --- /dev/null +++ b/docker/python/web2py-waitress/Dockerfile @@ -0,0 +1,25 @@ +FROM python:2.7 + +#LABEL your_label + +RUN apt update && \ + apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ + pip install waitress + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN cd /home/web2py/ && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/python/web2py-waitress/README.md b/docker/python/web2py-waitress/README.md new file mode 100755 index 00000000..3a615e1e --- /dev/null +++ b/docker/python/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/App/web2py-waitress + docker build -t your_username/app-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-waitress your_username/app-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/App/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/App/web2py-waitress + docker login -u your_username + docker build -t your_username/app-web2py-waitress . + docker push your_username/app-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/app-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-waitress your_username/app-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/python/web2py-waitress/docker-compose.yml b/docker/python/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/python/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/python/web2py-wsgiref/Dockerfile b/docker/python/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..4bb5d4a7 --- /dev/null +++ b/docker/python/web2py-wsgiref/Dockerfile @@ -0,0 +1,25 @@ +FROM python:2.7 + +#LABEL your_label + +RUN apt update && \ + apt install -y unzip wget python-pip && \ + pip install --upgrade pip && \ + pip install wsgiref + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN cd /home/web2py/ && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/python/web2py-wsgiref/README.md b/docker/python/web2py-wsgiref/README.md new file mode 100755 index 00000000..5a75b709 --- /dev/null +++ b/docker/python/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/App/web2py-wsgiref + docker build -t your_username/app-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-wsgiref your_username/app-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/App/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/App/web2py-wsgiref + docker login -u your_username + docker build -t your_username/app-web2py-wsgiref . + docker push your_username/app-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/app-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name app-web2py-wsgiref your_username/app-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/python/web2py-wsgiref/docker-compose.yml b/docker/python/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/python/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-diesel/Dockerfile b/docker/ubuntu/web2py-diesel/Dockerfile new file mode 100755 index 00000000..a4674785 --- /dev/null +++ b/docker/ubuntu/web2py-diesel/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget && \ + pip install virtualenv diesel + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s diesel -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-diesel/README.md b/docker/ubuntu/web2py-diesel/README.md new file mode 100755 index 00000000..afd85a71 --- /dev/null +++ b/docker/ubuntu/web2py-diesel/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-diesel + docker build -t your_username/ubuntu-web2py-diesel . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-diesel your_username/ubuntu-web2py-diesel + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-diesel + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-diesel + docker login -u your_username + docker build -t your_username/ubuntu-web2py-diesel . + docker push your_username/ubuntu-web2py-diesel + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-diesel . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-diesel your_username/ubuntu-web2py-diesel + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-diesel/docker-compose.yml b/docker/ubuntu/web2py-diesel/docker-compose.yml new file mode 100755 index 00000000..c7da8b6f --- /dev/null +++ b/docker/ubuntu/web2py-diesel/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-diesel: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-eventlet/Dockerfile b/docker/ubuntu/web2py-eventlet/Dockerfile new file mode 100755 index 00000000..234f1a78 --- /dev/null +++ b/docker/ubuntu/web2py-eventlet/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-eventlet && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s eventlet -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-eventlet/README.md b/docker/ubuntu/web2py-eventlet/README.md new file mode 100755 index 00000000..fd2e74e7 --- /dev/null +++ b/docker/ubuntu/web2py-eventlet/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-eventlet + docker build -t your_username/ubuntu-web2py-eventlet . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-eventlet your_username/ubuntu-web2py-eventlet + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-eventlet + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-eventlet + docker login -u your_username + docker build -t your_username/ubuntu-web2py-eventlet . + docker push your_username/ubuntu-web2py-eventlet + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-eventlet . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-eventlet your_username/ubuntu-web2py-eventlet + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-eventlet/docker-compose.yml b/docker/ubuntu/web2py-eventlet/docker-compose.yml new file mode 100755 index 00000000..0191e132 --- /dev/null +++ b/docker/ubuntu/web2py-eventlet/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-eventlet: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-gevent/Dockerfile b/docker/ubuntu/web2py-gevent/Dockerfile new file mode 100755 index 00000000..21456a64 --- /dev/null +++ b/docker/ubuntu/web2py-gevent/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-gevent && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s gevent -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-gevent/README.md b/docker/ubuntu/web2py-gevent/README.md new file mode 100755 index 00000000..4c44932f --- /dev/null +++ b/docker/ubuntu/web2py-gevent/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-gevent + docker build -t your_username/ubuntu-web2py-gevent . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-gevent your_username/ubuntu-web2py-gevent + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-gevent + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-gevent + docker login -u your_username + docker build -t your_username/ubuntu-web2py-gevent . + docker push your_username/ubuntu-web2py-gevent + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-gevent . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-gevent your_username/ubuntu-web2py-gevent + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-gevent/docker-compose.yml b/docker/ubuntu/web2py-gevent/docker-compose.yml new file mode 100755 index 00000000..6f44a69b --- /dev/null +++ b/docker/ubuntu/web2py-gevent/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-gevent: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-gunicorn/Dockerfile b/docker/ubuntu/web2py-gunicorn/Dockerfile index a9088253..098a1675 100755 --- a/docker/ubuntu/web2py-gunicorn/Dockerfile +++ b/docker/ubuntu/web2py-gunicorn/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:latest +#LABEL your_label + RUN apt update && \ - apt install -y python python-pip python-setuptools unzip wget gunicorn && \ - pip install --upgrade pip && \ + apt install -y python python-pip python-setuptools unzip wget python-gunicorn && \ pip install virtualenv RUN groupadd -r web2py && \ diff --git a/docker/ubuntu/web2py-gunicorn/README.md b/docker/ubuntu/web2py-gunicorn/README.md index 0cb7076e..9c265b2c 100755 --- a/docker/ubuntu/web2py-gunicorn/README.md +++ b/docker/ubuntu/web2py-gunicorn/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Ubuntu/web2py-gunicorn - docker build -t username/ubuntu-web2py-gunicorn . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-gunicorn username/ubuntu-web2py-gunicorn + docker build -t your_username/ubuntu-web2py-gunicorn . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-gunicorn your_username/ubuntu-web2py-gunicorn docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Ubuntu/web2py-gunicorn - docker login -u username - docker build -t username/ubuntu-web2py-gunicorn . - docker push username/ubuntu-web2py-gunicorn + docker login -u your_username + docker build -t your_username/ubuntu-web2py-gunicorn . + docker push your_username/ubuntu-web2py-gunicorn # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/ubuntu-web2py-gunicorn . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-gunicorn username/ubuntu-web2py-gunicorn +docker build -t your_username/ubuntu-web2py-gunicorn . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-gunicorn your_username/ubuntu-web2py-gunicorn docker-compose up -d docker-compose ps diff --git a/docker/ubuntu/web2py-paste/Dockerfile b/docker/ubuntu/web2py-paste/Dockerfile new file mode 100755 index 00000000..5c91e0a1 --- /dev/null +++ b/docker/ubuntu/web2py-paste/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-paste && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s paste -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-paste/README.md b/docker/ubuntu/web2py-paste/README.md new file mode 100755 index 00000000..662d2925 --- /dev/null +++ b/docker/ubuntu/web2py-paste/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-paste + docker build -t your_username/ubuntu-web2py-paste . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-paste your_username/ubuntu-web2py-paste + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-paste + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-paste + docker login -u your_username + docker build -t your_username/ubuntu-web2py-paste . + docker push your_username/ubuntu-web2py-paste + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-paste . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-paste your_username/ubuntu-web2py-paste + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-paste/docker-compose.yml b/docker/ubuntu/web2py-paste/docker-compose.yml new file mode 100755 index 00000000..092b7004 --- /dev/null +++ b/docker/ubuntu/web2py-paste/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-paste: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-rocket/Dockerfile b/docker/ubuntu/web2py-rocket/Dockerfile index 35445af9..ea48283d 100755 --- a/docker/ubuntu/web2py-rocket/Dockerfile +++ b/docker/ubuntu/web2py-rocket/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:latest +#LABEL your_label + RUN apt update && \ apt install -y python python-pip python-setuptools unzip wget && \ - pip install --upgrade pip && \ pip install virtualenv RUN groupadd -r web2py && \ diff --git a/docker/ubuntu/web2py-rocket/README.md b/docker/ubuntu/web2py-rocket/README.md index 1c69f86e..5837bf3f 100755 --- a/docker/ubuntu/web2py-rocket/README.md +++ b/docker/ubuntu/web2py-rocket/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Ubuntu/web2py-rocket - docker build -t username/ubuntu-web2py-rocket . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-rocket username/ubuntu-web2py-rocket + docker build -t your_username/ubuntu-web2py-rocket . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-rocket your_username/ubuntu-web2py-rocket docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Ubuntu/web2py-rocket - docker login -u username - docker build -t username/ubuntu-web2py-rocket . - docker push username/ubuntu-web2py-rocket + docker login -u your_username + docker build -t your_username/ubuntu-web2py-rocket . + docker push your_username/ubuntu-web2py-rocket # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/ubuntu-web2py-rocket . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-rocket username/ubuntu-web2py-rocket +docker build -t your_username/ubuntu-web2py-rocket . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-rocket your_username/ubuntu-web2py-rocket docker-compose up -d docker-compose ps diff --git a/docker/ubuntu/web2py-tornado/Dockerfile b/docker/ubuntu/web2py-tornado/Dockerfile index e8a62ffa..ae8beccf 100755 --- a/docker/ubuntu/web2py-tornado/Dockerfile +++ b/docker/ubuntu/web2py-tornado/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:latest +#LABEL your_label + RUN apt update && \ apt install -y python python-pip python-setuptools unzip wget python-tornado && \ - pip install --upgrade pip && \ pip install virtualenv RUN groupadd -r web2py && \ diff --git a/docker/ubuntu/web2py-tornado/README.md b/docker/ubuntu/web2py-tornado/README.md index 51c4479e..56d8a829 100755 --- a/docker/ubuntu/web2py-tornado/README.md +++ b/docker/ubuntu/web2py-tornado/README.md @@ -3,8 +3,8 @@ # Docker cd /Docker/Ubuntu/web2py-tornado - docker build -t username/ubuntu-web2py-tornado . - docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-tornado username/ubuntu-web2py-tornado + docker build -t your_username/ubuntu-web2py-tornado . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-tornado your_username/ubuntu-web2py-tornado docker ps docker volume ls docker volume inspect applications @@ -19,9 +19,9 @@ # Docker Cloud cd /Docker/Ubuntu/web2py-tornado - docker login -u username - docker build -t username/ubuntu-web2py-tornado . - docker push username/ubuntu-web2py-tornado + docker login -u your_username + docker build -t your_username/ubuntu-web2py-tornado . + docker push your_username/ubuntu-web2py-tornado # Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) cat << EOF > docker-compose.yml @@ -34,8 +34,8 @@ cat << EOF > Dockerfile EOF cat Dockerfile -docker build -t username/ubuntu-web2py-tornado . -docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-tornado username/ubuntu-web2py-tornado +docker build -t your_username/ubuntu-web2py-tornado . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-tornado your_username/ubuntu-web2py-tornado docker-compose up -d docker-compose ps diff --git a/docker/ubuntu/web2py-twisted/Dockerfile b/docker/ubuntu/web2py-twisted/Dockerfile new file mode 100755 index 00000000..49a06f8d --- /dev/null +++ b/docker/ubuntu/web2py-twisted/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-twisted && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s twisted -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-twisted/README.md b/docker/ubuntu/web2py-twisted/README.md new file mode 100755 index 00000000..e635e2b4 --- /dev/null +++ b/docker/ubuntu/web2py-twisted/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-twisted + docker build -t your_username/ubuntu-web2py-twisted . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-twisted your_username/ubuntu-web2py-twisted + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-twisted + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-twisted + docker login -u your_username + docker build -t your_username/ubuntu-web2py-twisted . + docker push your_username/ubuntu-web2py-twisted + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-twisted . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-twisted your_username/ubuntu-web2py-twisted + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-twisted/docker-compose.yml b/docker/ubuntu/web2py-twisted/docker-compose.yml new file mode 100755 index 00000000..ad47da77 --- /dev/null +++ b/docker/ubuntu/web2py-twisted/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-twisted: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-waitress/Dockerfile b/docker/ubuntu/web2py-waitress/Dockerfile new file mode 100755 index 00000000..cac27bd0 --- /dev/null +++ b/docker/ubuntu/web2py-waitress/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget python-waitress && \ + pip install virtualenv + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s waitress -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-waitress/README.md b/docker/ubuntu/web2py-waitress/README.md new file mode 100755 index 00000000..1808ae1f --- /dev/null +++ b/docker/ubuntu/web2py-waitress/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-waitress + docker build -t your_username/ubuntu-web2py-waitress . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-waitress your_username/ubuntu-web2py-waitress + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-waitress + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-waitress + docker login -u your_username + docker build -t your_username/ubuntu-web2py-waitress . + docker push your_username/ubuntu-web2py-waitress + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-waitress . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-waitress your_username/ubuntu-web2py-waitress + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-waitress/docker-compose.yml b/docker/ubuntu/web2py-waitress/docker-compose.yml new file mode 100755 index 00000000..38aff49e --- /dev/null +++ b/docker/ubuntu/web2py-waitress/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-waitress: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/docker/ubuntu/web2py-wsgiref/Dockerfile b/docker/ubuntu/web2py-wsgiref/Dockerfile new file mode 100755 index 00000000..76924e44 --- /dev/null +++ b/docker/ubuntu/web2py-wsgiref/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:latest + +#LABEL your_label + +RUN apt update && \ + apt install -y python python-pip python-setuptools unzip wget && \ + pip install virtualenv wsgiref + +RUN groupadd -r web2py && \ + useradd -m -r -g web2py web2py + +USER web2py + +RUN virtualenv /home/web2py && \ + rm -rf /home/web2py/web2py && \ + cd /home/web2py/ && \ + rm -f web2py_src.zip && \ + wget -c http://web2py.com/examples/static/web2py_src.zip && \ + unzip -o web2py_src.zip && \ + rm -rf /home/web2py/web2py/applications/examples && \ + chmod 755 -R /home/web2py/web2py + +WORKDIR /home/web2py/web2py + +EXPOSE 8000 + +CMD . /home/web2py/bin/activate && /usr/bin/python /home/web2py/web2py/anyserver.py -s wsgiref -i 0.0.0.0 -p 8000 diff --git a/docker/ubuntu/web2py-wsgiref/README.md b/docker/ubuntu/web2py-wsgiref/README.md new file mode 100755 index 00000000..0f99379d --- /dev/null +++ b/docker/ubuntu/web2py-wsgiref/README.md @@ -0,0 +1,41 @@ +# Start Service + systemctl start docker + +# Docker + cd /Docker/Ubuntu/web2py-wsgiref + docker build -t your_username/ubuntu-web2py-wsgiref . + docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-wsgiref your_username/ubuntu-web2py-wsgiref + docker ps + docker volume ls + docker volume inspect applications + +# Docker Compose + pip install docker-compose + cd /Docker/Ubuntu/web2py-wsgiref + docker-compose up -d + docker-compose ps + docker volume ls + docker volume inspect root_applications + +# Docker Cloud + cd /Docker/Ubuntu/web2py-wsgiref + docker login -u your_username + docker build -t your_username/ubuntu-web2py-wsgiref . + docker push your_username/ubuntu-web2py-wsgiref + +# Shell (Copy the content of the file into this scaffolding shell and replace the variable text $ with \$ ) +cat << EOF > docker-compose.yml + +EOF +cat docker-compose.yml + +cat << EOF > Dockerfile + +EOF +cat Dockerfile + +docker build -t your_username/ubuntu-web2py-wsgiref . +docker run -d -v applications:/home/web2py/web2py/applications -p 8000:8000 --name ubuntu-web2py-wsgiref your_username/ubuntu-web2py-wsgiref + +docker-compose up -d +docker-compose ps diff --git a/docker/ubuntu/web2py-wsgiref/docker-compose.yml b/docker/ubuntu/web2py-wsgiref/docker-compose.yml new file mode 100755 index 00000000..42fc212d --- /dev/null +++ b/docker/ubuntu/web2py-wsgiref/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.1' + +services: + web2py-wsgiref: + build: . + ports: + - "8000:8000" + volumes: + - applications:/home/web2py/web2py/applications + +volumes: + applications: diff --git a/gluon/contrib/AuthorizeNet.py b/gluon/contrib/AuthorizeNet.py index 02f7a697..705db6f8 100755 --- a/gluon/contrib/AuthorizeNet.py +++ b/gluon/contrib/AuthorizeNet.py @@ -18,7 +18,7 @@ from __future__ import print_function __all__ = ['AIM'] from operator import itemgetter -import urllib +from gluon._compat import urlopen, urlencode, FancyURLopener _known_tuple_types = {} @@ -116,17 +116,17 @@ class AIM: self.setParameter('x_tran_key', transkey) def process(self): - encoded_args = urllib.urlencode(self.parameters) + encoded_args = urlencode(self.parameters) if self.testmode == True: url = 'https://test.authorize.net/gateway/transact.dll' else: url = 'https://secure.authorize.net/gateway/transact.dll' if self.proxy is None: - self.results += str(urllib.urlopen( + self.results += str(urlopen( url, encoded_args).read()).split(self.delimiter) else: - opener = urllib.FancyURLopener(self.proxy) + opener = FancyURLopener(self.proxy) opened = opener.open(url, encoded_args) try: self.results += str(opened.read()).split(self.delimiter) diff --git a/gluon/contrib/DowCommerce.py b/gluon/contrib/DowCommerce.py index 31fd7927..f900c6b9 100644 --- a/gluon/contrib/DowCommerce.py +++ b/gluon/contrib/DowCommerce.py @@ -14,7 +14,7 @@ from __future__ import print_function __all__ = ['DowCommerce'] from operator import itemgetter -import urllib +from gluon._compat import urlopen, urlencode, FancyURLopene class DowCommerce: @@ -49,12 +49,12 @@ class DowCommerce: self.setParameter('password', password) def process(self): - encoded_args = urllib.urlencode(self.parameters) + encoded_args = urlencode(self.parameters) if self.proxy is None: - results = str(urllib.urlopen( + results = str(urlopen( self.url, encoded_args).read()).split(self.delimiter) else: - opener = urllib.FancyURLopener(self.proxy) + opener = FancyURLopener(self.proxy) opened = opener.open(self.url, encoded_args) try: results = str(opened.read()).split(self.delimiter) diff --git a/gluon/contrib/google_wallet.py b/gluon/contrib/google_wallet.py index b1da6200..822baa25 100644 --- a/gluon/contrib/google_wallet.py +++ b/gluon/contrib/google_wallet.py @@ -1,4 +1,4 @@ -from gluon import XML +from gluon.html import XML def button(merchant_id="123456789012345", products=[dict(name="shoes", diff --git a/gluon/contrib/login_methods/basic_auth.py b/gluon/contrib/login_methods/basic_auth.py index 88341d05..fb9ff717 100644 --- a/gluon/contrib/login_methods/basic_auth.py +++ b/gluon/contrib/login_methods/basic_auth.py @@ -1,5 +1,5 @@ -import urllib -import urllib2 +from gluon._compat import urlopen +from gluon._compat import urllib2 import base64 @@ -17,7 +17,7 @@ def basic_auth(server="http://127.0.0.1"): headers = {'Authorization': 'Basic ' + key} request = urllib2.Request(server, None, headers) try: - urllib2.urlopen(request) + urlopen(request) return True except (urllib2.URLError, urllib2.HTTPError): return False diff --git a/gluon/contrib/markdown/__init__.py b/gluon/contrib/markdown/__init__.py index e945876f..4378de21 100644 --- a/gluon/contrib/markdown/__init__.py +++ b/gluon/contrib/markdown/__init__.py @@ -1,4 +1,4 @@ -from markdown2 import * +from .markdown2 import * from gluon.html import XML def WIKI(text, encoding="utf8", safe_mode='escape', html4tags=False, **attributes): diff --git a/gluon/contrib/markdown/markdown2.py b/gluon/contrib/markdown/markdown2.py index 6eda8502..07797b92 100644 --- a/gluon/contrib/markdown/markdown2.py +++ b/gluon/contrib/markdown/markdown2.py @@ -4,6 +4,7 @@ # License: MIT (http://www.opensource.org/licenses/mit-license.php) from __future__ import generators +from __future__ import print_function r"""A fast and complete Python implementation of Markdown. @@ -35,7 +36,6 @@ This implementation of Markdown implements the full "core" syntax plus a number of extras (e.g., code syntax coloring, footnotes) as described on . """ -from __future__ import print_function cmdln_desc = """A fast and complete Python implementation of Markdown, a text-to-HTML conversion tool for web writers. diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py index 438b75b7..13bcf2b4 100644 --- a/gluon/contrib/simplejsonrpc.py +++ b/gluon/contrib/simplejsonrpc.py @@ -20,11 +20,12 @@ __version__ = "0.05" import sys PY2 = sys.version_info[0] == 2 -import urllib if PY2: + import urllib from xmlrpclib import Transport, SafeTransport from cStringIO import StringIO else: + import urllib.request as urllib from xmlrpc.client import Transport, SafeTransport from io import StringIO import random @@ -47,7 +48,7 @@ class JSONDummyParser: self.buf = StringIO() def feed(self, data): - self.buf.write(data) + self.buf.write(data.decode('utf-8')) def close(self): return self.buf.getvalue() @@ -61,7 +62,7 @@ class JSONTransportMixin: connection.putheader("Content-Length", str(len(request_body))) connection.endheaders() if request_body: - connection.send(request_body) + connection.send(str.encode(request_body)) # todo: add gzip compression def getparser(self): diff --git a/gluon/globals.py b/gluon/globals.py index 45862154..512f5761 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -667,7 +667,7 @@ class Response(Storage): (t, f) = (items.group('table'), items.group('field')) try: field = db[t][f] - except AttributeError: + except (AttributeError, KeyError): raise HTTP(404) try: (filename, stream) = field.retrieve(name, nameonly=True) diff --git a/gluon/packages/dal b/gluon/packages/dal index c954d1a2..70929a6d 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit c954d1a22a0b83d90f728a4ab2daaa954e3f16c8 +Subproject commit 70929a6dc03e6296c34944d2d232f257b78337d7 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index cfdf88ce..f32dc864 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -103,17 +103,18 @@ class CacheRepresenter(object): cache[field][value] = nvalue return nvalue + def safe_int(x, i=0): try: return int(x) - except ValueError: + except (ValueError, TypeError): return i def safe_float(x): try: return float(x) - except ValueError: + except (ValueError, TypeError): return 0 @@ -698,18 +699,20 @@ class AutocompleteWidget(object): if isinstance(field, Field.Virtual): records = [] table_rows = self.db(self.db[field.tablename]).select(orderby=self.orderby) - count = 0 + count = self.limitby[1] if self.limitby else -1 for row in table_rows: if self.at_beginning: if row[field.name].lower().startswith(kword): - count += 1 + count -= 1 records.append(row) else: if kword in row[field.name].lower(): - count += 1 + count -= 1 records.append(row) - if count == 10: + if count == 0: break + if self.limitby and self.limitby[0]: + records = records[self.limitby[0]:] rows = Rows(self.db, records, table_rows.colnames, compact=table_rows.compact) elif settings and settings.global_settings.web2py_runtime_gae: @@ -1089,7 +1092,7 @@ def formstyle_bootstrap3_inline_factory(col_label_size=3): # bootstrap 4 def formstyle_bootstrap4_stacked(form, fields): - """ bootstrap 3 format form layout + """ bootstrap 4 format form layout Note: Experimental! @@ -1138,7 +1141,7 @@ def formstyle_bootstrap4_stacked(form, fields): def formstyle_bootstrap4_inline_factory(col_label_size=3): - """ bootstrap 3 horizontal form layout + """ bootstrap 4 horizontal form layout Note: Experimental! @@ -2146,12 +2149,6 @@ class SQLFORM(FORM): value_input = widget_.widget(field, field.default, _id=_id, _class=widget_._class + ' form-control', **iso_format) - elif hasattr(field.requires, 'options'): - value_input = SELECT( - *[OPTION(v, _value=k) - for k, v in field.requires.options()], - _class='form-control', - **dict(_id=_id)) elif (field_type.startswith('integer') or field_type.startswith('reference ') or field_type.startswith('list:integer') or @@ -2165,6 +2162,13 @@ class SQLFORM(FORM): _type='text', _id=_id, _class="%s %s" % ((field_type or ''), 'form-control')) + if hasattr(field.requires, 'options'): + value_input = SELECT( + *[OPTION(v, _value=k) + for k, v in field.requires.options()], + _class='form-control', + **dict(_id=_id)) + new_button = INPUT( _type="button", _value=T('New Search'), _class="btn btn-default", _title=T('Start building a new search'), _onclick="%s_build_query('new','%s')" % (prefix, field)) @@ -2853,9 +2857,9 @@ class SQLFORM(FORM): if paginate and dbset._db._adapter.dbengine == 'google:datastore' and use_cursor: cursor = request.vars.cursor or True limitby = (0, paginate) - page = safe_int(request.vars.page, 1) - 1 + page = safe_int(request.vars.page or 1, 1) - 1 elif paginate and paginate < nrows: - page = safe_int(request.vars.page, 1) - 1 + page = safe_int(request.vars.page or 1, 1) - 1 limitby = (paginate * page, paginate * (page + 1)) else: limitby = None @@ -2897,7 +2901,7 @@ class SQLFORM(FORM): paginator = UL() if paginate and dbset._db._adapter.dbengine == 'google:datastore' and use_cursor: # this means we may have a large table with an unknown number of rows. - page = safe_int(request.vars.page, 1) - 1 + page = safe_int(request.vars.page or 1, 1) - 1 paginator.append(LI('page %s' % (page + 1))) if next_cursor: d = dict(page=page + 2, cursor=next_cursor) @@ -2916,7 +2920,7 @@ class SQLFORM(FORM): npages, reminder = divmod(nrows, paginate) if reminder: npages += 1 - page = safe_int(request.vars.page, 1) - 1 + page = safe_int(request.vars.page or 1, 1) - 1 def self_link(name, p): d = dict(page=p + 1) diff --git a/gluon/tools.py b/gluon/tools.py index bf4bd902..5cc4bf40 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -775,8 +775,8 @@ class Mail(object): if attachments: result = mail.send_mail( sender=sender, to=origTo, - subject=to_unicode(subject, encoding), - body=to_unicode(text or '', encoding), + subject=to_unicode(subject, encoding), + body=to_unicode(text or '', encoding), html=html, attachments=attachments, **xcc) elif html and (not raw): @@ -794,7 +794,7 @@ class Mail(object): try: raw = {'Data': payload.as_string()} response = client.send_raw_email(RawMessage=raw, - Source=sender, + Source=sender, Destinations=to) return True except ClientError as e: @@ -1311,6 +1311,8 @@ class AuthJWT(object): token = parts[1] else: token = current.request.vars.get(token_param) + if token is None: + raise HTTP(400, 'JWT header not found and JWT parameter {} missing in request'.format(token_param)) self.recvd_token = token return token @@ -2161,7 +2163,10 @@ class Auth(AuthAPI): user = None checks = [] # make a guess about who this user is - for fieldname in ['registration_id', 'username', 'email']: + guess_fields = ['registration_id', 'username', 'email'] + if self.settings.login_userfield: + guess_fields.append(self.settings.login_userfield) + for fieldname in guess_fields: if fieldname in table_user.fields() and \ keys.get(fieldname, None): checks.append(fieldname) @@ -2255,7 +2260,8 @@ class Auth(AuthAPI): def _get_login_settings(self): table_user = self.table_user() userfield = self.settings.login_userfield or 'username' \ - if 'username' in table_user.fields else 'email' + if self.settings.login_userfield or 'username' \ + in table_user.fields else 'email' passfield = self.settings.password_field return Storage({'table_user': table_user, 'userfield': userfield, @@ -3630,7 +3636,7 @@ class Auth(AuthAPI): onaccept = self.settings.profile_onaccept if log is DEFAULT: log = self.messages['profile_log'] - + form = SQLFORM( table_user, self.user.id, diff --git a/gluon/widget.py b/gluon/widget.py index ce731e5d..fbd522ae 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -943,9 +943,7 @@ def console(): k = len(sys.argv) sys.argv, other_args = sys.argv[:k], sys.argv[k + 1:] (options, args) = parser.parse_args() - options.args = other_args - if options.run: - options.args.insert(0, options.run) + options.args = [options.run] + other_args copy_options = copy.deepcopy(options) copy_options.password = '******'