Merge pull request #1406 from aptly-dev/release/1.6.0

Release/1.6.0

Author: neolynx

AUTHORS

@@ -67,4 +67,4 @@ List of contributors, in chronological order:
 * Christoph Fiehe (https://github.com/cfiehe)
 * Blake Kostner (https://github.com/btkostner)
 * Leigh London (https://github.com/leighlondon)
-* Gordian Schönherr (https://github.com/schoenherrg)
+* Gordian Schoenherr (https://github.com/schoenherrg)

CONTRIBUTING.md

@@ -91,6 +91,12 @@ Install the following on your development machine:
 - make
 - git
 
+##### Docker installation on macOS
+1. Install [Docker Desktop on Mac](https://docs.docker.com/desktop/setup/install/mac-install/) (or via [Homebrew](https://brew.sh/))
+2. Allow directory sharing
+   - Open Docker Desktop
+   - Go to `Settings → Resources → File Sharing → Virtual File Shares`
+   - Add the aptly git repository path to the shared list (eg. /home/Users/john/aptly)
 
 #### Create docker container
 

Makefile

@@ -216,4 +216,4 @@ clean:  ## remove local build and module cache
 	rm -f unit.out aptly.test VERSION docs/docs.go docs/swagger.json docs/swagger.yaml docs/swagger.conf
 	find system/ -type d -name __pycache__ -exec rm -rf {} \; 2>/dev/null || true
 
-.PHONY: help man prepare swagger version binaries docker-release docker-system-test docker-unit-test docker-lint docker-build docker-image build docker-shell clean releasetype dpkg serve docker-serve flake8
+.PHONY: help man prepare swagger version binaries build docker-release docker-system-test docker-unit-test docker-lint docker-build docker-image docker-man docker-shell docker-serve clean releasetype dpkg serve flake8

api/repos.go

@@ -94,7 +94,7 @@ type repoCreateParams struct {
 	// Default component when publishing from this local repo
 	DefaultComponent string `        json:"DefaultComponent"     example:"main"`
 	// Snapshot name to create repoitory from (optional)
-	FromSnapshot string `            json:"FromSnapshot"         example:"snapshot1"`
+	FromSnapshot string `            json:"FromSnapshot"         example:""`
 }
 
 // @Summary Create Repository

cmd/repo_include.go

@@ -93,7 +93,7 @@ Command include looks for .changes files in list of arguments or specified direc
 .changes file is verified, parsed, referenced files are put into separate temporary directory
 and added into local repository. Successfully imported files are removed by default.
 
-Additionally uploads could be restricted with <uploaders.json> file. Rules in this file control
+Additionally uploads could be restricted with 'uploaders.json' file. Rules in this file control
 uploads based on GPG key ID of .changes file signature and queries on .changes file fields.
 
 Example:

debian/changelog

@@ -1,5 +1,29 @@
-aptly (1.6.0~rc1) stable; urgency=medium
+aptly (1.6.0) stable; urgency=medium
 
-  * release candidate
+  * support reading filters from file or stdin
+  * fix mirroring source packages
+  * support yaml config per default
+  * provide swagger API documentation
+  * provide API for querying aptly storage usage
+  * provide snapshot pull via API
+  * support creating repos from snapshots
+  * fix mirroring flat remote repos
+  * support skeleton files for publishing
+  * use new azure sdk
+  * support updating the components of a published repo
+  * support publishing multiple distributions (-multi-dist)
+  * support etcd database
+  * allow slash (/) in distribution names
+  * support for storing the "local" pool on Azure
+  * provide copy package API
+  * fix publish concurrency and improve performance
+  * improved mirroring
+  * fix download throttling
+  * fix resuming package downloads
+  * fix ignoring signatures
+  * fix packages dependency resolution (Virtual Packages, version numbers in Provides)
+  * improved S3 support and performance
+  * fix race condition with goleveldb
+  * use go 1.22
 
- -- André Roth <neolynx@gmail.com>  Sat, 16 Nov 2024 12:44:06 +0100
+ -- André Roth <neolynx@gmail.com>  Tue, 24 Dec 2024 17:44:35 +0100

debian/control

@@ -90,6 +90,7 @@ Package: aptly
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, gpgv, gpg
 Suggests: graphviz
+Conflicts: gnupg1, gpgv1
 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
 Description: Swiss army knife for Debian repository management - main package
  It offers several features making it easy to manage Debian package

man/aptly.1

@@ -31,7 +31,7 @@ aptly looks for configuration file first in \fB~/\.aptly\.conf\fR then in \fB/us
 With aptly version 1\.6\.0, yaml configuration with inline documentation is supported and recommended (see \fBdebian/aptly\.conf\fR)\.
 .
 .P
-The legacy json configuration is still supported:
+The legacy json configuration is still supported (and also supports comments):
 .
 .IP "" 4
 .
@@ -1129,7 +1129,7 @@ include dependencies into search results
 Command include looks for \.changes files in list of arguments or specified directories\. Each \.changes file is verified, parsed, referenced files are put into separate temporary directory and added into local repository\. Successfully imported files are removed by default\.
 .
 .P
-Additionally uploads could be restricted with
+Additionally uploads could be restricted with \(cquploaders\.json\(cq file\. Rules in this file control uploads based on GPG key ID of \.changes file signature and queries on \.changes file fields\.
 .
 .P
 Example:
@@ -2672,7 +2672,7 @@ Blake Kostner (https://github\.com/btkostner)
 Leigh London (https://github\.com/leighlondon)
 .
 .IP "\[ci]" 4
-Gordian Schönherr (https://github\.com/schoenherrg)
+Gordian Schoenherr (https://github\.com/schoenherrg)
 .
 .IP "" 0
 

man/aptly.1.ronn.tmpl

@@ -21,9 +21,10 @@ aptly has integrated help that matches contents of this manual page, to get help
 aptly looks for configuration file first in `~/.aptly.conf` then in `/usr/local/etc/aptly.conf` and `/etc/aptly.conf`. If no config file found (or they are not readable), a new one is created in the
 home directory. If `-config=` flag is specified, aptly would use config file at specified location. Also aptly needs root directory for database, package and published repository storage.  If not specified, directory defaults to `~/.aptly/`, it will be created if missing.
 
-With aptly version 1.6.0, yaml configuration with inline documentation is supported and recommended (see `debian/aptly.conf`).
+With aptly version 1.6.0, yaml configuration with inline documentation is
+supported and recommended (see `debian/aptly.conf`).
 
-The legacy json configuration is still supported:
+The legacy json configuration is still supported (and also supports comments):
 
     // vim: : filetype=json
     // json configuration file with comments