Merge pull request #2 from larkinwc/feature/fix-release

feat: Fixing release commands in makefile

Author: larkinwc

.github/workflows/release.yml

@@ -30,4 +30,4 @@ jobs:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} 
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.gitignore

@@ -5,4 +5,5 @@ release_todos.md
 
 
 # package
-lxc-compose
+lxc-compose
+templates

.goreleaser.yml

@@ -40,12 +40,6 @@ archives:
       - README.md
       - LICENSE*
 
-checksum:
-  name_template: 'checksums.txt'
-
-snapshot:
-  name_template: "{{ incpatch .Version }}-next"
-
 changelog:
   sort: asc
   filters:
@@ -55,29 +49,4 @@ changelog:
       - '^ci:'
       - '^chore:'
       - Merge pull request
-      - Merge branch
-
-brews:
-  - name: proxmox-lxc-compose
-    tap:
-      owner: larkinwc
-      name: homebrew-tap
-    folder: Formula
-    homepage: "https://github.com/larkinwc/proxmox-lxc-compose"
-    description: "A docker-compose like tool for managing LXC containers in Proxmox"
-    license: "MIT"
-    test: |
-      system "#{bin}/lxc-compose --version"
-    install: |
-      bin.install "lxc-compose"
-
-dockers:
-  - image_templates:
-      - "ghcr.io/larkinwc/proxmox-lxc-compose:{{ .Version }}"
-      - "ghcr.io/larkinwc/proxmox-lxc-compose:latest"
-    dockerfile: Dockerfile
-    build_flag_templates:
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}" 
+      - Merge branch

Dockerfile

@@ -62,21 +62,21 @@ CURRENT_VERSION=$(shell git describe --tags --abbrev=0 2>/dev/null || echo "v0.0
 
 release-major: ## Create a new major release
 	@echo "Current version: $(CURRENT_VERSION)"
-	@NEW_VERSION=$$(semver bump major $(CURRENT_VERSION)) && \
+	@NEW_VERSION=$$(echo "$(CURRENT_VERSION)" | awk -F. '{gsub("v",""); printf "v%d.0.0", $$1+1}') && \
 	echo "Creating major release: $$NEW_VERSION" && \
 	git tag -a $$NEW_VERSION -m "Major release $$NEW_VERSION" && \
 	git push origin $$NEW_VERSION
 
 release-minor: ## Create a new minor release
 	@echo "Current version: $(CURRENT_VERSION)"
-	@NEW_VERSION=$$(semver bump minor $(CURRENT_VERSION)) && \
+	@NEW_VERSION=$$(echo "$(CURRENT_VERSION)" | awk -F. '{gsub("v",""); printf "v%d.%d.0", $$1, $$2+1}') && \
 	echo "Creating minor release: $$NEW_VERSION" && \
 	git tag -a $$NEW_VERSION -m "Minor release $$NEW_VERSION" && \
 	git push origin $$NEW_VERSION
 
 release-patch: ## Create a new patch release
 	@echo "Current version: $(CURRENT_VERSION)"
-	@NEW_VERSION=$$(semver bump patch $(CURRENT_VERSION)) && \
+	@NEW_VERSION=$$(echo "$(CURRENT_VERSION)" | awk -F. '{gsub("v",""); printf "v%d.%d.%d", $$1, $$2, $$3+1}') && \
 	echo "Creating patch release: $$NEW_VERSION" && \
 	git tag -a $$NEW_VERSION -m "Patch release $$NEW_VERSION" && \
 	git push origin $$NEW_VERSION

Makefile

@@ -129,7 +129,7 @@ The main purpose of the CLI is to read a lxc-compose.yml file and use it to crea
 ## Installation
 
 ```bash
-go install github.com/yourusername/proxmox-lxc-compose@latest
+go install github.com/larkinwc/proxmox-lxc-compose@latest
 ```
 
 Or build from source:
@@ -140,6 +140,11 @@ cd proxmox-lxc-compose
 go build -o lxc-compose ./cmd/lxc-compose
 ```
 
+You can optionally move the binary to your PATH:
+```bash
+sudo mv lxc-compose /usr/local/bin/
+```
+
 ## Configuration
 
 Configuration can be provided via:
@@ -179,7 +184,7 @@ lxc-compose ps
 lxc-compose logs [container_name]
 
 # Pull container images
-lxc-compose pull [image_name]
+lxc-compose images pull [registry/repository:tag]
 
 # Convert Docker images to LXC
 lxc-compose convert [image_name]

README.md

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"proxmox-lxc-compose/pkg/oci"
+	"github.com/larkinwc/proxmox-lxc-compose/pkg/oci"
 
 	"github.com/spf13/cobra"
 )

cmd/lxc-compose/convert.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"proxmox-lxc-compose/pkg/common"
-	"proxmox-lxc-compose/pkg/container"
+	"github.com/larkinwc/proxmox-lxc-compose/pkg/common"
+	"github.com/larkinwc/proxmox-lxc-compose/pkg/container"
 
 	"github.com/spf13/cobra"
 )

cmd/lxc-compose/down.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"proxmox-lxc-compose/pkg/container"
+	"github.com/larkinwc/proxmox-lxc-compose/pkg/container"
 
 	"github.com/spf13/cobra"
 )

cmd/lxc-compose/logs.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"proxmox-lxc-compose/pkg/logging"
+	"github.com/larkinwc/proxmox-lxc-compose/pkg/logging"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"