diff --git a/AUTHORS b/AUTHORS index 69d479c3f..d62f1573d 100644 --- a/AUTHORS +++ b/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) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 780dbf5db..762cf8a47 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/Makefile b/Makefile index 1794a6b2e..d6a81da49 100644 --- a/Makefile +++ b/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 diff --git a/api/repos.go b/api/repos.go index 43a19cc9b..4cc04f695 100644 --- a/api/repos.go +++ b/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 diff --git a/cmd/repo_include.go b/cmd/repo_include.go index cba3fb306..4aa26d419 100644 --- a/cmd/repo_include.go +++ b/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 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: diff --git a/debian/changelog b/debian/changelog index 47d58eb10..c5bdffa9f 100644 --- a/debian/changelog +++ b/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 Sat, 16 Nov 2024 12:44:06 +0100 + -- André Roth Tue, 24 Dec 2024 17:44:35 +0100 diff --git a/debian/control b/debian/control index 101dbcf12..b6c4d8ded 100644 --- a/debian/control +++ b/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 diff --git a/man/aptly.1 b/man/aptly.1 index 5a323fb3e..bd6ad2231 100644 --- a/man/aptly.1 +++ b/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 diff --git a/man/aptly.1.ronn.tmpl b/man/aptly.1.ronn.tmpl index b948aaf42..203cc7fe2 100644 --- a/man/aptly.1.ronn.tmpl +++ b/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