refactor

owncloud-ci · Aug 29, 2022 · c04c9cf · c04c9cf
1 parent 0450aac
commit c04c9cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.drone.star b/.drone.star
@@ -16,8 +16,8 @@ def main(ctx):
   # then,
   #   'latest': '22.04'
   base_img_tag = {
+    'latest': 'u21.04',
     'fedora': '36',
-    'latest': '21.04',
   }
 
   config = {
@@ -44,12 +44,13 @@ def main(ctx):
       config['arch'] = arch
 
       if config['version'] == 'latest':
-        config['tag'] = arch
-        config['tag'] += '%s-%s' % (base_img_tag[config['version']], arch)
-      elif config['version'] == 'fedora':
-        config['tag'] = '%s.%s-%s' % (config['version'], base_img_tag[config['version']], arch)
+        config['tag'] = [arch]
+        config['tag'].append('%s-%s' % (base_img_tag[config['version']], arch))
       else:
-        config['tag'] = '%s-%s' % (config['version'], arch)
+        config['tag'] = ['%s-%s' % (config['version'], arch)]
+        # generate tag based on base image version
+        if config['version'] in base_img_tag:
+          config['tag'].append('%s-%s-%s' % (config['version'], base_img_tag[config['version']], arch))
 
       if config['arch'] == 'amd64':
         config['platform'] = 'amd64'

diff --git a/fedora/manifest.tmpl b/fedora/manifest.tmpl
@@ -1,6 +1,6 @@
-image: owncloudci/client:fedora.36
+image: owncloudci/client:fedora
 manifests:
-  - image: owncloudci/client:fedora.36-amd64
+  - image: owncloudci/client:fedora-amd64
     platform:
       architecture: amd64
       os: linux