33 Commits

Author SHA1 Message Date
Justin Kromlinger
fb1d1a3499
Drop duplicate labels 2023-06-08 20:20:09 +02:00
Justin Kromlinger
e2d91e1ea7
Merge branch 'master' of ssh://gitlab.archlinux.org:222/archlinux/archlinux-docker 2023-06-08 20:18:13 +02:00
Justin Kromlinger
74dc761af8
Add additional opencontainers labels, fix version id 2023-06-08 20:18:07 +02:00
Justin Kromlinger
c3cc18f520
Add opencontainers labels to the image
Resolves #75.
2023-06-08 19:01:27 +02:00
renovate
9e02744bb9 Update alpine Docker tag to v3.18 2023-05-26 20:10:41 +00:00
Michael Vorburger.ch
d89f8be698
Fix minor typo in Dockerfile.template 2023-04-16 23:08:02 +02:00
renovate
fcd0328e30
Update alpine Docker tag to v3.17 2022-11-16 22:23:54 +00:00
nl6720
18e8a88aec
Use C.UTF-8
The glibc 2.35-6 package ships with the C.UTF-8 locale included.
This means there is now a UTF-8 locale available by default and en_US.UTF-8, which requires editing /etc/locale.gen and running locale-gen, is not needed anymore.
2022-06-17 08:28:46 +03:00
Justin Kromlinger
5a681fd335
Add date and build number as VERSION_ID to /etc/os-release
Resolves #68
2022-06-16 17:04:25 +02:00
Justin Kromlinger
64d4832a71
Update alpine in multistage Dockerfile template
Resolves https://github.com/docker-library/official-images/pull/12535#issuecomment-1142701007
2022-06-01 12:26:26 +02:00
Justin Kromlinger
d47ca225ee
Replace xz with zstd
Closes #63.

Using `zstd -T0 -8` instead of `gz -T0 -9` results in a larger rootfs
file, but requires significantly less time and memory:

```

zstd  -3 115M   1.60user 0.18system 0:00.32elapsed 557%CPU (0avgtext+0avgdata  130212maxresident)k
zstd  -6 107M   5.03user 0.24system 0:00.72elapsed 729%CPU (0avgtext+0avgdata  149660maxresident)k
zstd  -7 106M   7.33user 0.29system 0:01.04elapsed 728%CPU (0avgtext+0avgdata  174368maxresident)k
zstd  -8 105M   8.45user 0.27system 0:01.23elapsed 707%CPU (0avgtext+0avgdata  173008maxresident)k
zstd  -9 104M   9.35user 0.37system 0:01.42elapsed 683%CPU (0avgtext+0avgdata  335920maxresident)k
zstd -13 104M  30.57user 0.31system 0:04.76elapsed 648%CPU (0avgtext+0avgdata  498740maxresident)k
zstd -19  91M 132.06user 0.53system 0:21.98elapsed 603%CPU (0avgtext+0avgdata 1106328maxresident)k
xz    -9  81M 105.71user 0.58system 0:58.24elapsed 182%CPU (0avgtext+0avgdata 2006964maxresident)k
```

Additionally this drops bash from the build Dockerfile, since `SHELL` is
not OCI compliant.
2022-04-13 17:48:07 +02:00
Justin Kromlinger
e8d7daa790
Avoid curl call on local builds 2021-09-18 16:11:09 +02:00
Justin Kromlinger
3c694ab7f1
Drop --continue-at from curl call
It is incompatible with -J and done automatically. See [1].

[1] https://gitlab.archlinux.org/archlinux/archlinux-docker/-/jobs/34434#L72
2021-09-18 13:04:19 +02:00
Justin Kromlinger
20c6261eb0
Revert "Drop -J / --remote-header-name from curl call"
This reverts commit 1d15a041f708fa5bf2ae84a5a9377ea5400f1ceb.
2021-09-18 13:02:46 +02:00
Justin Kromlinger
1d15a041f7
Drop -J / --remote-header-name from curl call
It is incompatible with --continue-at. See [1].

[1] https://gitlab.archlinux.org/archlinux/archlinux-docker/-/jobs/34434#L72
2021-09-16 20:33:52 +02:00
Justin Kromlinger
6b36cb9812
Provide a pretty release link in the Dockerfile
Resolves #49.
2020-11-18 19:04:34 +01:00
Justin Kromlinger
f875ac9565
Move ldconfig back to Dockerfile since its a noop in fakechroot
strace: execve("/bin/true", ["ldconfig"], 0x563fc29f9fa0 /* 101 vars */) = 0
2020-11-07 17:52:39 +01:00
Justin Kromlinger
d177146b3b
Move all Dockerfile commands to Makefile
Resolves #45.
2020-11-07 16:49:07 +01:00
Justin Kromlinger
7d5a90c0a0
Drop apk update since we use --no-cache 2020-11-02 20:13:19 +01:00
Justin Kromlinger
0ad84af7b7
Drop alpine version pins, ignore DL3018
https://gitlab.archlinux.org/archlinux/archlinux-docker/-/merge_requests/47#note_6125
2020-11-02 20:03:42 +01:00
Justin Kromlinger
fdd9e81fc0
Switch to 3.12 versions for curl and bash 2020-11-02 19:44:04 +01:00
Justin Kromlinger
1fe6646735
DL3018, DL3018: Pin apk package versions, use --no-cache 2020-11-02 19:37:20 +01:00
Justin Kromlinger
daa67d1857
Switch to alpine in verify stage
This fixes a circular dependency issue noted in [1].

`curl -s` and removal of `--auto-compress` are needed because of
differences in the binaries in alpine.

[1] https://github.com/docker-library/official-images/pull/8999#issuecomment-720622797
2020-11-02 19:30:07 +01:00
Sven-Hendrik Haase
4443f7f8bd
Turns out we need --continue-at - for local builds still 2020-10-25 05:09:47 +01:00
Sven-Hendrik Haase
ca6e2dbddf
Proper way to get effective filename 2020-10-25 04:49:26 +01:00
Sven-Hendrik Haase
34f172d65a
Add big block of documentation to Dockerfile 2020-10-23 04:10:36 +02:00
Sven-Hendrik Haase
dc895e48cf
Rename second layer to root 2020-10-19 04:10:52 +02:00
Sven-Hendrik Haase
ecb01053cc
Use ./exclude mechanism for /etc/resolv.conf 2020-10-19 01:13:04 +02:00
Kristian Klausen
3bf05f92aa
Exclude /etc/resolv.conf 2020-10-19 01:03:22 +02:00
Sven-Hendrik Haase
2706f3bb9a
Add note for kaniko and resolv.conf 2020-10-18 05:02:53 +02:00
Sven-Hendrik Haase
13793e559d
Try copying underlying /etc/resolv.conf 2020-10-18 04:47:36 +02:00
Kristian Klausen
9b52d5674a Generate and verify checksum for the rootfs 2020-10-13 16:11:15 +02:00
Sven-Hendrik Haase
d51a887efb
Add base-devel tag 2020-08-31 18:20:52 +02:00