Skip to content

Commit 51210eb

Browse files
committed
Sort packages
1 parent e53cb5b commit 51210eb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docker/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ pkgs+=(binutils-gold) # Required build tool.
4646
pkgs+=(curl) # Dependency for tools requiring downloading data.
4747
pkgs+=(dpkg-dev) # Required packaging tool.
4848
pkgs+=(debhelper) # Required packaging tool.
49-
pkgs+=(xz-utils) # Required to install nix
5049
pkgs+=(file) # Required packaging tool.
5150
pkgs+=(git) # Required build tool.
5251
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -61,6 +60,7 @@ pkgs+=(python3-pip) # Package manager for Python applications.
6160
pkgs+=(unzip) # Dependency for tools requiring unzipping files.
6261
pkgs+=(vim) # Text editor.
6362
pkgs+=(wget) # Required build tool.
63+
pkgs+=(xz-utils) # Required to install nix
6464
apt-get update
6565
apt-get install -y --no-install-recommends "${pkgs[@]}"
6666
apt-get clean
@@ -194,7 +194,7 @@ EOF
194194

195195
# Install nix
196196
RUN <<EOF
197-
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
197+
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
198198

199199
# Verify the installation. Should be run from a new shell.
200200
bash -c 'nix --version'

docker/rhel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if [[ "${RHEL_VERSION}" == "8" ]]; then
2828
else
2929
pkgs+=(binutils-gold) # Required build tool.
3030
fi
31+
pkgs+=(curl) # Required to install nix
3132
pkgs+=(file) # Required packaging tool.
3233
pkgs+=(git) # Required build tool.
3334
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -56,7 +57,6 @@ pkgs+=(rpm-build) # Required packaging tool.
5657
pkgs+=(unzip) # Dependency for tools requiring unzipping files.
5758
pkgs+=(vim) # Text editor.
5859
pkgs+=(wget) # Required build tool.
59-
pkgs+=(curl) # Required to install nix
6060
pkgs+=(xz) # Required to install nix
6161
dnf update -y
6262
dnf install -y --allowerasing --setopt=tsflags=nodocs "${pkgs[@]}"
@@ -310,7 +310,7 @@ EOF
310310

311311
# Install nix
312312
RUN <<EOF
313-
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
313+
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
314314

315315
# Verify the installation. Should be run from a new shell.
316316
bash -c 'nix --version'

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by provi
2929
pkgs+=(binutils-gold) # Required build tool.
3030
pkgs+=(curl) # Dependency for tools requiring downloading data.
3131
pkgs+=(dpkg-dev) # Required packaging tool.
32-
pkgs+=(xz-utils) # Required to install nix
3332
pkgs+=(file) # Required packaging tool.
3433
pkgs+=(git) # Required build tool.
3534
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -44,6 +43,7 @@ pkgs+=(python3-pip) # Package manager for Python applications.
4443
pkgs+=(unzip) # Dependency for tools requiring unzipping files.
4544
pkgs+=(vim) # Text editor.
4645
pkgs+=(wget) # Required build tool.
46+
pkgs+=(xz-utils) # Required to install nix
4747
apt-get update
4848
apt-get install -y --no-install-recommends "${pkgs[@]}"
4949
apt-get clean
@@ -167,7 +167,7 @@ EOF
167167

168168
# Install nix
169169
RUN <<EOF
170-
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
170+
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
171171

172172
# Verify the installation. Should be run from a new shell.
173173
bash -c 'nix --version'

0 commit comments

Comments
 (0)