Merge branch '3.2' of github.com:abcdesktopio/oc.template into 3.2

abcdesktopio · Mar 26, 2024 · 78b254c · 78b254c
2 parents 113c80b + cb18b06
commit 78b254c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/oc.template.rockylinux b/oc.template.rockylinux
@@ -1,8 +1,8 @@
 
 # default TAG is dev
+ARG TAG=dev
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-
+FROM ${BASE_IMAGE}:${TAG}
 
 # add some fonts
 RUN yum update -y && \

diff --git a/rules/level0.json b/rules/level0.json
@@ -1,5 +1,15 @@
 { "include" : 
   [
+  {
+    "source": "abcdesktopio/oc.template.rockylinux.minimal.8",
+    "target": "oc.template.rockylinux.8",
+    "dockerfile": "oc.template.rockylinux"
+  },
+  {
+    "source": "abcdesktopio/oc.template.rockylinux.minimal.9",
+    "target": "oc.template.rockylinux.9",
+    "dockerfile": "oc.template.rockylinux"
+  },
   {
     "source": "abcdesktopio/oc.template.alpine.minimal.3.17",
     "target": "oc.template.alpine.3.17",

diff --git a/rules/level1.json b/rules/level1.json
@@ -1,5 +1,15 @@
 { "include" : 
   [
+  {
+    "source": "abcdesktopio/oc.template.rockylinux.8",
+    "target": "oc.template.rockylinux.gtk.8",
+    "dockerfile": "oc.template.rockylinux.gtk"
+  },
+  {
+    "source": "abcdesktopio/oc.template.rockylinux.9",
+    "target": "oc.template.rockylinux.gtk.9",
+    "dockerfile": "oc.template.rockylinux.gtk"
+  },
   {
     "source": "abcdesktopio/oc.template.debian",
     "target": "oc.template.debian.gtk",