Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix docker layers ownership info in Focal #3

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Fix docker layers ownership info in Focal #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
docker.io-app (20.10.25-0ubuntu1~20.04.2) focal; urgency=medium

* Fix docker layers ownership info (LP: #2029523, #2029893)
- Build with Go 1.20
+ d/control: b-d on golang-1.20-go intead of golang-1.18-go
+ d/rules: add Go 1.20 to $PATH

-- Artem Leshchev <matshch@avride.ai> Thu, 03 Aug 2023 21:03:37 +0300

docker.io-app (20.10.25-0ubuntu1~20.04.1) focal; urgency=medium

* Backport version from Mantic to Focal (LP: #2023694, #2022390)
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build-Depends: bash-completion,
dh-exec,
dh-golang,
git,
golang-1.18-go,
golang-1.20-go,
libapparmor-dev,
libbtrfs-dev | btrfs-progs (<< 4.16.1~),
libdevmapper-dev (>= 2:1.02.68~),
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export GOCACHE := $(CURDIR)/.gocache
# https://blog.golang.org/go116-module-changes (TODO figure out a new solution for Go 1.17+)
export GO111MODULE := auto

# Build with Golang 1.18
export PATH := /usr/lib/go-1.18/bin:$(PATH)
# Build with Golang 1.20
export PATH := /usr/lib/go-1.20/bin:$(PATH)

# AppArmor can be optionally used in Debian and is there by default in Ubuntu, so we need support for it compiled into our binary
# same story with SELinux
Expand Down