From bce71908b205ebd35eb1c5a1cadd6fa224ab5294 Mon Sep 17 00:00:00 2001 From: Jonathan Piron Date: Thu, 3 May 2018 15:56:24 +0200 Subject: [PATCH] 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=''