Merge pull request #7 from StamusNetworks/trunk

Rebasing trunk in main

Author: lanathlor

.github/workflows/release.yaml

@@ -61,10 +61,6 @@ jobs:
                 include:
                     - { runner: ubuntu-latest, os: linux, arch: amd64, go-version: 1.22 }
 
-        # permissions:
-        #     contents: write # to be able to publish a GitHub release
-        #     issues: write # to be able to comment on released issues
-        #     pull-requests: write # to be able to comment on released pull requests
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitlab-ci.yml

@@ -7,6 +7,7 @@ workflow:
         - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
         - if: $CI_COMMIT_TAG
         - if: $CI_COMMIT_BRANCH == "main"
+        - if: $CI_COMMIT_BRANCH == "trunk" && $CI_PIPELINE_SOURCE != 'merge_request_event'
 
 stages:
     - ut

cmd/ctl/compose/update.go

@@ -26,6 +26,8 @@ func updateCmd() *cobra.Command {
 	// Add flags
 	flags.Version.AddAsFlag(cmd, false)
 	flags.Config.AddAsFlag(cmd, false)
+	flags.Template.AddAsFlag(cmd, false)
+
 	return cmd
 }
 
@@ -39,12 +41,17 @@ func updateHandler(_ *cobra.Command, args []string) {
 	if err != nil {
 		return
 	}
+	templateFolder, err := flags.Template.GetValue()
+	if err != nil {
+		return
+	}
+
 	// Call handler
 	params := handlers.UpdateHandlerParams{
 		Version:        version.(string),
 		Config:         config.(string),
+		TemplateFolder: templateFolder.(string),
 		Args:           args,
-		TemplateFolder: "",
 	}
 
 	handlers.UpdateHandler(params)

gitlab/release.yml

@@ -49,20 +49,24 @@ delete-env-from-app-of-apps:
 release-to-github:
     stage: release
     image: bitnami/git
-    needs:
-        - full test w test config
     rules:
-        - if: '$CI_COMMIT_BRANCH == "main"'
-          when: on_success
+        - if: $CI_COMMIT_BRANCH
+    script:
+        - git config --global user.email $GITLAB_USER_EMAIL
+        - git config --global user.name $GITLAB_USER_NAME
+        - git remote add github "https://$GITHUB_USERNAME:[email protected]/StamusNetworks/stamusctl.git"
+        - git push -u --no-thin -f github HEAD:refs/heads/$CI_COMMIT_BRANCH
+
+release-to-github-from-mr:
+    stage: release
+    image: bitnami/git
+    rules:
+        - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     script:
         - git config --global user.email $GITLAB_USER_EMAIL
         - git config --global user.name $GITLAB_USER_NAME
         - git remote add github "https://$GITHUB_USERNAME:[email protected]/StamusNetworks/stamusctl.git"
-        - git fetch github
-        - git checkout -b github-trunk
-        - git branch --set-upstream-to github/trunk
-        - git pull --rebase
-        - git push github HEAD:trunk
+        - git push -u --no-thin -f github HEAD:refs/heads/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
 
 upload stamusctl:
     stage: release

internal/docker-compose/wrapper.go

@@ -34,13 +34,17 @@ var ComposeFlags = models.ComposeFlags{
 		[]string{"file"},
 		[]string{"volumes", "remove-orphans"},
 	),
+	"restart": models.CreateComposeFlags(
+		[]string{"file"},
+		[]string{},
+	),
 	"ps": models.CreateComposeFlags(
 		[]string{"file"},
 		[]string{"services", "quiet", "format"},
 	),
 	"logs": models.CreateComposeFlags(
 		[]string{"file"},
-		[]string{"timestamps", "tail", "since", "until"},
+		[]string{"timestamps", "tail", "since", "until", "follow", "details"},
 	),
 	"pull": models.CreateComposeFlags(
 		[]string{"file"},
@@ -119,6 +123,7 @@ func WrappedCmd(composeFlags models.ComposeFlags) ([]*cobra.Command, map[string]
 func modifyFileFlag(c *cobra.Command) {
 	// Modify flags
 	c.Flags().Lookup("file").Hidden = true
+	c.Flags().Lookup("file").Shorthand = ""
 	stamusFlags.Config.AddAsFlag(c, false)
 	// Save the command
 	currentRunE := c.RunE

internal/handlers/compose/init.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -142,7 +143,9 @@ func InitHandler(isCli bool, params InitHandlerInputs) error {
 
 	logger.Debug("Save config to: ", outputFile)
 	if err = config.SaveConfigTo(outputFile, false, true); err != nil {
-		return err
+		if !errors.Is(err, models.ErrorEmptyFolder) {
+			return err
+		}
 	}
 
 	// Bind files

internal/handlers/compose/update.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	// Common
 
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -178,9 +179,11 @@ func UpdateHandler(params UpdateHandlerParams) error {
 	// Save the configuration
 	err = newConfig.SaveConfigTo(confFile, true, false)
 	if err != nil {
-		logger.Error(err)
+		if !errors.Is(err, models.ErrorEmptyFolder) {
+			logger.Error(err)
 
-		return err
+			return err
+		}
 	}
 
 	// Run post-run script