From 35b4cc1d298419610ab4cbeded604edc52438e6a Mon Sep 17 00:00:00 2001 From: Jonathan Piron Date: Thu, 3 May 2018 15:56:12 +0200 Subject: [PATCH 1/4] Update python base image To fix : https://github.com/muccg/docker-devpi/issues/11 --- Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce8a750..98b40b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # -FROM python:3.5-alpine +FROM python:3.6.5 MAINTAINER https://github.com/muccg/ ARG ARG_DEVPI_SERVER_VERSION @@ -15,12 +15,9 @@ ENV PIP_TRUSTED_HOST="127.0.0.1" ENV VIRTUAL_ENV /env # devpi user -RUN addgroup -S -g 1000 devpi \ - && adduser -D -S -u 1000 -h /data -s /sbin/nologin -G devpi devpi +RUN addgroup --system --gid 1000 devpi \ + && adduser --disabled-password --system --uid 1000 --home /data --shell /sbin/nologin --gid 1000 devpi -# entrypoint is written in bash -RUN apk add --no-cache bash - # create a virtual env in $VIRTUAL_ENV, ensure it respects pip version RUN pip install virtualenv \ && virtualenv $VIRTUAL_ENV \ From bce71908b205ebd35eb1c5a1cadd6fa224ab5294 Mon Sep 17 00:00:00 2001 From: Jonathan Piron Date: Thu, 3 May 2018 15:56:24 +0200 Subject: [PATCH 2/4] Update default versions --- .env | 6 +++--- Dockerfile | 6 +++--- docker-entrypoint.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 7bf5c5a..14229dd 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ #!/bin/sh CCG_PROJECT=devpi -DOCKER_DEVPI_SERVER_VERSION=4.1.1 -DOCKER_DEVPI_CLIENT_VERSION=2.7.0 -DOCKER_DEVPI_WEB_VERSION=3.1.1 +DOCKER_DEVPI_SERVER_VERSION=4.4.0 +DOCKER_DEVPI_CLIENT_VERSION=4.0.1 +DOCKER_DEVPI_WEB_VERSION=3.2.2 DOCKER_ROUTE BRANCH_NAME diff --git a/Dockerfile b/Dockerfile index 98b40b1..a356c7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM python:3.6.5 MAINTAINER https://github.com/muccg/ -ARG ARG_DEVPI_SERVER_VERSION -ARG ARG_DEVPI_WEB_VERSION -ARG ARG_DEVPI_CLIENT_VERSION +ARG ARG_DEVPI_SERVER_VERSION=4.4.0 +ARG ARG_DEVPI_WEB_VERSION=3.2.2 +ARG ARG_DEVPI_CLIENT_VERSION=4.0.1 ENV DEVPI_SERVER_VERSION $ARG_DEVPI_SERVER_VERSION ENV DEVPI_WEB_VERSION $ARG_DEVPI_WEB_VERSION diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c1b8cc2..d181a44 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -12,7 +12,7 @@ function defaults { function initialise_devpi { echo "[RUN]: Initialise devpi-server" - devpi-server --restrict-modify root --start --host 127.0.0.1 --port 3141 + devpi-server --restrict-modify root --start --host 127.0.0.1 --port 3141 --init devpi-server --status devpi use http://localhost:3141 devpi login root --password='' From b9da55db6a20ad22e19d61e78f50bcab35b1b152 Mon Sep 17 00:00:00 2001 From: Jonathan Piron Date: Thu, 3 May 2018 16:00:56 +0200 Subject: [PATCH 3/4] Remove deprecated MAINTAINER instruction --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a356c7e..c0cfada 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # FROM python:3.6.5 -MAINTAINER https://github.com/muccg/ +LABEL maintainer="https://github.com/muccg/" ARG ARG_DEVPI_SERVER_VERSION=4.4.0 ARG ARG_DEVPI_WEB_VERSION=3.2.2 From 17f80251a9f65f905f33ec3c106d4a681b2d3f16 Mon Sep 17 00:00:00 2001 From: Jonathan Piron Date: Tue, 22 May 2018 16:39:43 +0200 Subject: [PATCH 4/4] Update default versions --- .env | 6 +++--- Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 14229dd..158f866 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ #!/bin/sh CCG_PROJECT=devpi -DOCKER_DEVPI_SERVER_VERSION=4.4.0 -DOCKER_DEVPI_CLIENT_VERSION=4.0.1 -DOCKER_DEVPI_WEB_VERSION=3.2.2 +DOCKER_DEVPI_SERVER_VERSION=4.5.0 +DOCKER_DEVPI_CLIENT_VERSION=4.0.2 +DOCKER_DEVPI_WEB_VERSION=3.3.0 DOCKER_ROUTE BRANCH_NAME diff --git a/Dockerfile b/Dockerfile index c0cfada..3a4aeb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM python:3.6.5 LABEL maintainer="https://github.com/muccg/" -ARG ARG_DEVPI_SERVER_VERSION=4.4.0 -ARG ARG_DEVPI_WEB_VERSION=3.2.2 -ARG ARG_DEVPI_CLIENT_VERSION=4.0.1 +ARG ARG_DEVPI_SERVER_VERSION=4.5.0 +ARG ARG_DEVPI_WEB_VERSION=3.3.0 +ARG ARG_DEVPI_CLIENT_VERSION=4.0.2 ENV DEVPI_SERVER_VERSION $ARG_DEVPI_SERVER_VERSION ENV DEVPI_WEB_VERSION $ARG_DEVPI_WEB_VERSION