From 740dae96b0ad59b159ae0e1efd8f940d666fd517 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Jul 10 2019 18:53:23 +0000
Subject: Set the container environment variable to oci.


Certain applications are using the container env variable to
know if they are running in a container or not. This is making sure
we have this define in the fedora base image..

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1399507

Signed-off-by: Clement Verna <cverna@tutanota.com>

---

diff --git a/fedora-container.conf b/fedora-container.conf
index 711bb13..95ad16b 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -234,7 +234,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
+                'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
             },
         },
@@ -256,7 +256,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
+                'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
             },
         }
diff --git a/fedora.conf b/fedora.conf
index 5184ab8..a4fe485 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -329,7 +329,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f31container", "FGC=f31" ]',
+                'docker_env': '[ "DISTTAG=f31container", "FGC=f31", "container=oci" ]',
                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}',
             },
         },
@@ -349,7 +349,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f31container", "FGC=f31" ]',
+                'docker_env': '[ "DISTTAG=f31container", "FGC=f31", "container=oci" ]',
                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}',
             },
         }