changeset 2af0e310892c in tryton-docker-demo:default details: https://hg.tryton.org/tryton-docker-demo?cmd=changeset;node=2af0e310892c description: Build image with authentication_none module included
issue9157 review297251002 diffstat: 5.0.env | 1 + 5.2.env | 1 + 5.4.env | 1 + 5.6.env | 1 + Dockerfile | 26 ++++++++++++++++++++++++++ docker-compose.yml | 36 ++++++++++++++++++++++++++---------- update.sh | 3 ++- 7 files changed, 58 insertions(+), 11 deletions(-) diffs (184 lines): diff -r d24576ae87e0 -r 2af0e310892c 5.0.env --- a/5.0.env Mon May 04 16:06:08 2020 +0200 +++ b/5.0.env Wed May 20 10:16:33 2020 +0200 @@ -4,3 +4,4 @@ TRYTOND_EMAIL__URI=smtp://smtpd:25 TRYTOND_PASSWORD__LENGTH=0 TRYTOND_PASSWORD__ENTROPY=0 +TRYTOND_SESSION__AUTHENTICATIONS=none,password diff -r d24576ae87e0 -r 2af0e310892c 5.2.env --- a/5.2.env Mon May 04 16:06:08 2020 +0200 +++ b/5.2.env Wed May 20 10:16:33 2020 +0200 @@ -8,3 +8,4 @@ TRYTOND_QUEUE__WORKER=true TRYTOND_BUS__ALLOW_SUBSCRIBE=true TRYTOND_BUS__URL_HOST=https://demo-bus5.2.tryton.org/ +TRYTOND_SESSION__AUTHENTICATIONS=none,password diff -r d24576ae87e0 -r 2af0e310892c 5.4.env --- a/5.4.env Mon May 04 16:06:08 2020 +0200 +++ b/5.4.env Wed May 20 10:16:33 2020 +0200 @@ -8,3 +8,4 @@ TRYTOND_QUEUE__WORKER=true TRYTOND_BUS__ALLOW_SUBSCRIBE=true TRYTOND_BUS__URL_HOST=https://demo-bus5.4.tryton.org/ +TRYTOND_SESSION__AUTHENTICATIONS=none,password diff -r d24576ae87e0 -r 2af0e310892c 5.6.env --- a/5.6.env Mon May 04 16:06:08 2020 +0200 +++ b/5.6.env Wed May 20 10:16:33 2020 +0200 @@ -8,3 +8,4 @@ TRYTOND_QUEUE__WORKER=true TRYTOND_BUS__ALLOW_SUBSCRIBE=true TRYTOND_BUS__URL_HOST=https://demo-bus5.6.tryton.org/ +TRYTOND_SESSION__AUTHENTICATIONS=none,password diff -r d24576ae87e0 -r 2af0e310892c Dockerfile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Dockerfile Wed May 20 10:16:33 2020 +0200 @@ -0,0 +1,26 @@ +ARG SERIES + +FROM tryton/tryton:$SERIES as builder +USER root +WORKDIR / +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + mercurial \ + && rm -rf /var/lib/apt/lists/* +RUN hg clone https://hg.tryton.org/tpf/authentication_none \ + && cd authentication_none \ + && python3 setup.py sdist + +FROM tryton/tryton:$SERIES +LABEL maintainer="Tryton <foundat...@tryton.org>" \ + org.label-schema.name="Tryton Demo" \ + org.label-schema.url="http://www.tryton.org/" \ + org.label-schema.vendor="Tryton" \ + org.label-schema.version="$SERIES" \ + org.label-schema.schema-version="1.0" +USER root +COPY --from=builder /authentication_none/dist /dist +RUN pip3 install --no-cache-dir --install-option="-O1" \ + /dist/* \ + && rm -rf /root/.cache /dist/ +USER trytond diff -r d24576ae87e0 -r 2af0e310892c docker-compose.yml --- a/docker-compose.yml Mon May 04 16:06:08 2020 +0200 +++ b/docker-compose.yml Wed May 20 10:16:33 2020 +0200 @@ -7,7 +7,11 @@ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} restart: unless-stopped tryton-5.6: - image: tryton/tryton:5.6 + build: + context: . + args: + SERIES: 5.6 + image: tryton/tryton-demo:5.6 env_file: 5.6.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -17,7 +21,7 @@ - postgres-5.6 restart: unless-stopped tryton-worker-5.6: - image: tryton/tryton:5.6 + image: tryton/tryton-demo:5.6 env_file: 5.6.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -26,7 +30,7 @@ - postgres-5.6 restart: unless-stopped tryton-bus-5.6: - image: tryton/tryton:5.6 + image: tryton/tryton-demo:5.6 env_file: 5.6.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -43,7 +47,11 @@ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} restart: unless-stopped tryton-5.4: - image: tryton/tryton:5.4 + build: + context: . + args: + SERIES: 5.4 + image: tryton/tryton-demo:5.4 env_file: 5.4.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -53,7 +61,7 @@ - postgres-5.4 restart: unless-stopped tryton-worker-5.4: - image: tryton/tryton:5.4 + image: tryton/tryton-demo:5.4 env_file: 5.4.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -62,7 +70,7 @@ - postgres-5.4 restart: unless-stopped tryton-bus-5.4: - image: tryton/tryton:5.4 + image: tryton/tryton-demo:5.4 env_file: 5.4.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -79,7 +87,11 @@ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} restart: unless-stopped tryton-5.2: - image: tryton/tryton:5.2 + build: + context: . + args: + SERIES: 5.2 + image: tryton/tryton-demo:5.2 env_file: 5.2.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -89,7 +101,7 @@ - postgres-5.2 restart: unless-stopped tryton-worker-5.2: - image: tryton/tryton:5.2 + image: tryton/tryton-demo:5.2 env_file: 5.2.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -98,7 +110,7 @@ - postgres-5.2 restart: unless-stopped tryton-bus-5.2: - image: tryton/tryton:5.2 + image: tryton/tryton-demo:5.2 env_file: 5.2.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} @@ -115,7 +127,11 @@ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} restart: unless-stopped tryton-5.0: - image: tryton/tryton:5.0 + build: + context: . + args: + SERIES: 5.0 + image: tryton/tryton-demo:5.0 env_file: 5.0.env environment: - DB_PASSWORD=${POSTGRES_PASSWORD} diff -r d24576ae87e0 -r 2af0e310892c update.sh --- a/update.sh Mon May 04 16:06:08 2020 +0200 +++ b/update.sh Wed May 20 10:16:33 2020 +0200 @@ -5,7 +5,8 @@ proj="demo" docker-compose -p ${proj} down -docker-compose -p ${proj} pull --quiet +docker-compose -p ${proj} pull --ignore-pull-failures --quiet || : # disable error status +docker-compose -p ${proj} build --pull --quiet for directory in databases/?.?; do series=$(basename ${directory})