From 5361f7f3833da67c01cd9a3817500781d5e2803c Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Aug 27 2020 06:38:33 +0000 Subject: Set correct app version in Dockerfile JIRA: RHELWF-1647 Signed-off-by: Lukas Holecek --- diff --git a/.dockerignore b/.dockerignore index 0a3edad..eab2b16 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ .env/ -.git/ .pytest_cache/ .tox/ .vscode/ diff --git a/Dockerfile b/Dockerfile index b96dd37..bbbfa86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,12 +33,19 @@ RUN if [ "$cacert_url" != "undefined" ]; then \ RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt COPY . /tmp/code -RUN cd /tmp/code \ +RUN set -ex \ + && cd /tmp/code \ + && version=$(./get-version.sh) \ + && test -n "$version" \ + && sed --regexp-extended -i -e \ + "/^__version__ = /c\\__version__ = '$version'" greenwave/__init__.py \ && pip3 install . --no-deps \ && mkdir /src/docker \ && cp -v docker/docker-entrypoint.sh /src/docker \ && cp -vr conf /src \ - && rm -rf /tmp/* + && rm -rf /tmp/* \ + # Quick test for the installed package and version + && python3 -c "import greenwave; assert(greenwave.__version__ == '$version')" USER 1001 EXPOSE 8080