Commit Graph

281 Commits

Author SHA1 Message Date
hashworks
cd6d85768d Merge branch 'renovate/gcr.io-kaniko-project-executor-1.x' into 'master'
Update gcr.io/kaniko-project/executor Docker tag to v1.10.0

See merge request archlinux/archlinux-docker!69
2023-06-08 18:46:03 +00:00
renovate
6a986d0426 Update gcr.io/kaniko-project/executor Docker tag to v1.10.0 2023-06-08 18:34:19 +00:00
Justin Kromlinger
875fdf5e26
Fix missing | in sed 2023-06-08 20:31:21 +02:00
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
hashworks
4afa2a09af Merge branch 'renovate/alpine-3.x' into 'master'
Update alpine Docker tag to v3.18

See merge request archlinux/archlinux-docker!73
2023-05-26 20:23:08 +00:00
renovate
9e02744bb9 Update alpine Docker tag to v3.18 2023-05-26 20:10:41 +00:00
hashworks
c2f9a8ac85 Merge branch 'devtools-1.0.0' into 'master'
Adjust the path to "pacman-extra.conf" for devtools>=1.0.0

See merge request archlinux/archlinux-docker!74
2023-05-26 20:09:51 +00:00
Kristian Klausen
44c5b4f90e
Adjust the path to "pacman-extra.conf" for devtools>=1.0.0 2023-05-26 22:01:42 +02:00
hashworks
6a1f7a1965 Merge branch 'units' into 'master'
README: update image sizes and use proper units

See merge request archlinux/archlinux-docker!67
2023-04-19 10:56:12 +00:00
nl6720
80898b1da2
README: update image sizes and use proper units
The sizes are liberally rounded values from https://gitlab.archlinux.org/archlinux/archlinux-docker/container_registry/2.
2023-04-19 08:56:41 +03:00
hashworks
a866d979b3 Merge branch 'vorburger-master-patch-31338' into 'master'
Fix minor typo in Dockerfile.template

See merge request archlinux/archlinux-docker!70
2023-04-16 21:18:11 +00:00
Michael Vorburger.ch
d89f8be698
Fix minor typo in Dockerfile.template 2023-04-16 23:08:02 +02:00
hashworks
d60d2173b6 Merge branch 'renovate/alpine-3.x' into 'master'
Update alpine Docker tag to v3.17

See merge request archlinux/archlinux-docker!71
2022-11-17 15:39:28 +00:00
renovate
fcd0328e30
Update alpine Docker tag to v3.17 2022-11-16 22:23:54 +00:00
hashworks
c80251c457 Revert "Merge branch 'renovate/gcr.io-kaniko-project-executor-1.x' into 'master'"
This reverts merge request !68
2022-07-21 10:31:24 +00:00
hashworks
68795f4ab5 Merge branch 'renovate/gcr.io-kaniko-project-executor-1.x' into 'master'
Update dependency gcr.io/kaniko-project/executor to v1.8.1

See merge request archlinux/archlinux-docker!68
2022-07-19 19:29:11 +00:00
renovate
e8e68a0448
Update dependency gcr.io/kaniko-project/executor to v1.8.1 2022-07-19 19:17:47 +00:00
hashworks
da9db8e3cf Merge branch 'renovate/configure' into 'master'
Configure Renovate

See merge request archlinux/archlinux-docker!62
2022-06-30 06:36:59 +00:00
renovate
3e25a3ff6c
Add renovate.json 2022-06-29 09:23:39 +00:00
hashworks
1c25d3ae65 Merge branch 'x11-locale' into 'master'
keep some more /usr/share/X11/locale files

See merge request archlinux/archlinux-docker!63
2022-06-29 08:35:29 +00:00
Pace Willisson
5e137bab0f keep some more /usr/share/X11/locale files 2022-06-25 19:11:45 -04:00
hashworks
6c28971174 Merge branch 'pacman-key-populate' into 'master'
Do not pass a keyring name to pacman-key

See merge request archlinux/archlinux-docker!65
2022-06-19 15:07:10 +00:00
nl6720
f3f1068b7a
Do not pass a keyring name to pacman-key
If the keyring is not specified, pacman-key will simply use all keyrings from /usr/share/pacman/keyrings/.
2022-06-17 18:22:48 +03:00
hashworks
531f908607 Merge branch 'C.UTF-8' into 'master'
Use C.UTF-8

See merge request archlinux/archlinux-docker!64
2022-06-17 13:40:08 +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
de90f8c38d
Use zst in CI 2022-04-15 10:40:25 +02:00
hashworks
5380ff0684 Merge branch 'zstd' into 'master'
Replace xz with zstd

Closes #63

See merge request archlinux/archlinux-docker!61
2022-04-13 23:08:01 +00:00
Justin Kromlinger
47a614ade9
Add --long to zstd call 2022-04-14 01:02:30 +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
30d0b5b130
Parametrize 'docker' command
Allows 'make image-base DOCKER=podman'

Originally from: Grzegorz Klimaszewski <2612193+grzegorzk@users.noreply.github.com>
https://github.com/archlinux/archlinux-docker/pull/38/files

Closes #51.
2022-04-13 16:46:25 +02:00
hashworks
ff51588eac Merge branch 'switch-to-geoip-mirror' into 'master'
Switch to GeoIP mirror

See merge request archlinux/archlinux-docker!60
2022-04-13 13:38:54 +00:00
Evangelos Foutras
0b36cae9ab
Switch to GeoIP mirror
Currently consists of 3 geographically diverse boxes which are managed
by DevOps. (See commit 9f65f99c6b2330e7e2fbceb988115c5cc65db09f in the
archlinux/infrastructure project.)
2022-04-13 04:30:04 +03:00
Justin Kromlinger
bc4d9f8ec5
Also use ignore-var-run in image:publish:secure
See 52729f9911
2021-11-13 13:21:54 +01:00
Justin Kromlinger
eaafb9773e
Use fixed kaniko image tag 2021-11-01 14:19:49 +01:00
Justin Kromlinger
52729f9911
Kaniko: whitelist-var-run has been deprecated by ignore-var-run 2021-10-21 09:45:42 +02:00
Justin Kromlinger
3cc06c313a
Remove unused pacman config
Not used, copied from devtools since 2cbbe5a720.

Resolves #58.
2021-10-21 08:14:28 +02:00
Justin Kromlinger
ed6f8898e0
Make sure --private-token is set before the release-cli create subcommand 2021-10-18 12:03:30 +02:00
Justin Kromlinger
ce17571d1f
Set private token of release-cli call to project token
As suggested by @klausenbusk, this ensures that the releases are created
by the project bot/user instead of the schedule-owner.
2021-10-17 16:22:55 +02:00
hashworks
cd3beac574 Merge branch 'fix/localBuild' into 'master'
Avoid curl call on local builds

See merge request archlinux/archlinux-docker!59
2021-09-19 00:17:00 +00: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 1d15a041f7.
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
9cbe452289
Update pacman.conf to pacman-6.0.0-2
As suggested by xatier on GitHub:
* https://github.com/archlinux/archlinux-docker/pull/41
* https://github.com/archlinux/archlinux-docker/pull/42/files
2021-06-07 18:25:27 +02:00
hashworks
183225149d Merge branch 'add-warning-on-lsign-key' into 'master'
README: add note on lsign-key

Closes #18

See merge request archlinux/archlinux-docker!58
2021-05-02 14:34:27 +00:00