Merge branch 'development' into 'main'

Update docker push pipeline See merge request BrianDMG/conv2mp4!22
BrianDMG · Sep 16, 2021 · 4c505de · 4c505de
2 parents ca51bfc + c1e1457
commit 4c505de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitlab/pipelines/.app_img_pipeline.yml b/.gitlab/pipelines/.app_img_pipeline.yml
@@ -62,7 +62,7 @@ Docker Push:
   script:
     - docker pull ${COMMIT_TAG}
     - >
-      if [ "${branch}" == 'main' ]; then
+      if [ "${CI_COMMIT_BRANCH}" == 'main' ]; then
         LATEST_TAG=${MAIN_LATEST_TAG}
       fi
     - docker tag ${COMMIT_TAG} ${LATEST_TAG}

diff --git a/files/cfg/config.yaml.template b/files/cfg/config.yaml.template
@@ -1,4 +1,5 @@
 #Copy this file and rename to 'config.yaml"
+#See https://gitlab.com/BrianDMG/conv2mp4/-/wikis/Configuration for configration setup
 
 #conv2mp4 configuration
 schedule:
@@ -36,4 +37,4 @@ cleanup:
   #'true' enables garbage collection feature, 'false' disabled it
   enable: true
   #File types to delete on each run
-  include_file_types: "*.nfo"
+  include_file_types: "*.nfo"