From a37f3c09946fd569995d171c69c25254e42fdd26 Mon Sep 17 00:00:00 2001 From: erichard <elliot.richard@lal.in2p3.fr> Date: Tue, 21 Jul 2020 14:20:24 +0200 Subject: [PATCH] refactor Dockerfiles --- docker/Dockerfile_externals | 10 ++-------- docker/Dockerfile_latest | 17 ++++++----------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/docker/Dockerfile_externals b/docker/Dockerfile_externals index 6708ff3..aa20ced 100644 --- a/docker/Dockerfile_externals +++ b/docker/Dockerfile_externals @@ -23,16 +23,10 @@ RUN pip3 install --trusted-host pypi.python.org -r requirements.txt EXPOSE 5000 -ENV FLASK_APP=demo_blog +ENV FLASK_APP=demo_flask ENV FLASK_ENV=development ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 -ENV APP_SETTINGS="demo_blog.config.DevelopmentConfig" -ENV APP_MAIL_SERVER="lalrelay.in2p3.fr" -ENV APP_MAIL_USERNAME="coding-pool-smtp@lal.in2p3.fr" -ENV APP_MAIL_PASSWORD="C0dingP00l" - -ENV CODEGUARDS_ENV='demo_blog.config.DevelopmentConfig' - +ENV LABELSTOWER_ENV="app.config.ConfigCodingPool" diff --git a/docker/Dockerfile_latest b/docker/Dockerfile_latest index c3fe4a4..0d39417 100644 --- a/docker/Dockerfile_latest +++ b/docker/Dockerfile_latest @@ -1,29 +1,24 @@ # Version DEMO -FROM codeguards:dev +FROM labelstower:dev # Ensure use of bash SHELL ["/bin/bash","-c"] -# Install codeguards +# Install labelstower RUN pip3 install --upgrade pip setuptools wheel -COPY codeguards-latest-py3-none-any.whl codeguards-latest-py3-none-any.whl -RUN pip3 install codeguards-latest-py3-none-any.whl +COPY labelstower-latest-py3-none-any.whl labelstower-latest-py3-none-any.whl +RUN pip3 install labelstower-latest-py3-none-any.whl # Run flask EXPOSE 5000 -ENV FLASK_APP=demo +ENV FLASK_APP=demo_flask ENV FLASK_ENV=development ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 -ENV APP_SETTINGS="demo_blog.config.DevelopmentConfig" -ENV APP_MAIL_SERVER="lalrelay.in2p3.fr" -ENV APP_MAIL_USERNAME="coding-pool-smtp@lal.in2p3.fr" -ENV APP_MAIL_PASSWORD="C0dingP00l" - -ENV CODEGUARDS_ENV='test.demo.config.DevelopmentConfig' +ENV LABELSTOWER_ENV="app.config.ConfigCodingPool" CMD [ "flask", "run", "--reload", "--host", "0.0.0.0" ] \ No newline at end of file -- GitLab