ATALLC
diff --git a/‎3.6/Dockerfile.fedora‎
Lines changed: 7 additions & 2 deletions b/‎3.6/Dockerfile.fedora‎
Lines changed: 7 additions & 2 deletions
@@ -1,6 +1,6 @@
 # This image provides a Python 3.6 environment you can use to run your Python
 # applications.
-FROM registry.fedoraproject.org/f27/s2i-base:latest
+FROM registry.fedoraproject.org/f28/s2i-base:latest
 
 EXPOSE 8080
 
@@ -36,7 +36,6 @@ LABEL summary="$SUMMARY" \
       name="$FGC/$NAME" \
       version="$VERSION" \
       release="$RELEASE.$DISTTAG" \
-      architecture="$ARCH" \
       usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.6/test/setup-test-app/ $FGC/$NAME python-sample-app" \
       maintainer="SoftwareCollections.org <sclorg@redhat.com>"
 
@@ -63,6 +62,12 @@ RUN virtualenv-$PYTHON_VERSION ${APP_ROOT} && \
     chown -R 1001:0 ${APP_ROOT} && \
     fix-permissions ${APP_ROOT} -P
 
+# For Fedora scl_enable isn't sourced automatically in s2i-core
+# so virtualenv needs to be activated this way
+ENV BASH_ENV="${APP_ROOT}/bin/activate" \
+    ENV="${APP_ROOT}/bin/activate" \
+    PROMPT_COMMAND=". ${APP_ROOT}/bin/activate"
+
 USER 1001
 
 # Set the default CMD to print the usage of the language image.