From 99eb61abaf727cf3aada1c971f872bb484da52b7 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Thu, 3 Feb 2022 18:28:54 +0100
Subject: [PATCH] fix pyenv, enhance dockerfile metadata

---
 Dockerfile            | 35 ++++++++++++++++++++++++-----------
 Dockerfile.centos7    |  6 +++++-
 tools/docker_build.sh |  2 +-
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cef83b5811..7232223c3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,18 @@
 # Build Pype docker image
-FROM debian:bookworm-slim AS builder
+FROM ubuntu:focal AS builder
 ARG OPENPYPE_PYTHON_VERSION=3.7.12
+ARG BUILD_DATE
+ARG VERSION
 
 LABEL maintainer="info@openpype.io"
-LABEL description="Docker Image to build and run OpenPype"
+LABEL description="Docker Image to build and run OpenPype under Ubuntu 20.04"
 LABEL org.opencontainers.image.name="pypeclub/openpype"
 LABEL org.opencontainers.image.title="OpenPype Docker Image"
 LABEL org.opencontainers.image.url="https://openpype.io/"
-LABEL org.opencontainers.image.source="https://github.com/pypeclub/pype"
+LABEL org.opencontainers.image.source="https://github.com/pypeclub/OpenPype"
+LABEL org.opencontainers.image.documentation="https://openpype.io/docs/system_introduction"
+LABEL org.opencontainers.image.created=$BUILD_DATE
+LABEL org.opencontainers.image.version=$VERSION
 
 USER root
 
@@ -42,14 +47,19 @@ RUN apt-get update \
 
 SHELL ["/bin/bash", "-c"]
 
+
 RUN mkdir /opt/openpype
 
+# download and install pyenv
 RUN curl https://pyenv.run | bash \
-    && echo 'export PATH="$HOME/.pyenv/bin:$PATH"'>> $HOME/.bashrc \
-    && echo 'eval "$(pyenv init -)"' >> $HOME/.bashrc \
-    && echo 'eval "$(pyenv virtualenv-init -)"' >> $HOME/.bashrc \
-    && echo 'eval "$(pyenv init --path)"' >> $HOME/.bashrc \
-    && source $HOME/.bashrc && pyenv install ${OPENPYPE_PYTHON_VERSION}
+    && echo 'export PATH="$HOME/.pyenv/bin:$PATH"'>> $HOME/init_pyenv.sh \
+    && echo 'eval "$(pyenv init -)"' >> $HOME/init_pyenv.sh \
+    && echo 'eval "$(pyenv virtualenv-init -)"' >> $HOME/init_pyenv.sh \
+    && echo 'eval "$(pyenv init --path)"' >> $HOME/init_pyenv.sh
+
+# install python with pyenv
+RUN source $HOME/init_pyenv.sh \
+    && pyenv install ${OPENPYPE_PYTHON_VERSION}
 
 COPY . /opt/openpype/
 
@@ -57,13 +67,16 @@ RUN chmod +x /opt/openpype/tools/create_env.sh && chmod +x /opt/openpype/tools/b
 
 WORKDIR /opt/openpype
 
+# set local python version
 RUN cd /opt/openpype \
-    && source $HOME/.bashrc \
+    && source $HOME/init_pyenv.sh \
     && pyenv local ${OPENPYPE_PYTHON_VERSION}
 
-RUN source $HOME/.bashrc \
+# fetch third party tools/libraries
+RUN source $HOME/init_pyenv.sh \
     && ./tools/create_env.sh \
     && ./tools/fetch_thirdparty_libs.sh
 
-RUN source $HOME/.bashrc \
+# build openpype
+RUN source $HOME/init_pyenv.sh \
     && bash ./tools/build.sh
diff --git a/Dockerfile.centos7 b/Dockerfile.centos7
index 736a42663c..16cb02cd20 100644
--- a/Dockerfile.centos7
+++ b/Dockerfile.centos7
@@ -1,11 +1,15 @@
 # Build Pype docker image
 FROM centos:7 AS builder
-ARG OPENPYPE_PYTHON_VERSION=3.7.10
+ARG OPENPYPE_PYTHON_VERSION=3.7.12
 
 LABEL org.opencontainers.image.name="pypeclub/openpype"
 LABEL org.opencontainers.image.title="OpenPype Docker Image"
 LABEL org.opencontainers.image.url="https://openpype.io/"
 LABEL org.opencontainers.image.source="https://github.com/pypeclub/pype"
+LABEL org.opencontainers.image.documentation="https://openpype.io/docs/system_introduction"
+LABEL org.opencontainers.image.created=$BUILD_DATE
+LABEL org.opencontainers.image.version=$VERSION
+
 
 USER root
 
diff --git a/tools/docker_build.sh b/tools/docker_build.sh
index 04c26424eb..7d61986883 100755
--- a/tools/docker_build.sh
+++ b/tools/docker_build.sh
@@ -68,7 +68,7 @@ main () {
 
   echo -e "${BIGreen}>>>${RST} Running docker build ..."
   # docker build --pull --no-cache -t pypeclub/openpype:$openpype_version .
-  docker build --pull --iidfile $openpype_root/build/docker-image.id -t pypeclub/openpype:$openpype_version -f $dockerfile .
+  docker build --pull --iidfile $openpype_root/build/docker-image.id --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VERSION=$openpype_version -t pypeclub/openpype:$openpype_version -f $dockerfile .
   if [ $? -ne 0 ] ; then
     echo $?
     echo -e "${BIRed}!!!${RST} Docker build failed."