fix(docker): Order package dependencies alphabetically

Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>

Author: stv0g

packaging/docker/Dockerfile.debian

@@ -28,30 +28,30 @@ RUN apt-get update && \
 # Dependencies
 RUN apt-get update && \
 	apt-get install -y \
-	libssl-dev \
-	libgraphviz-dev \
-	libprotobuf-dev \
-	libprotobuf-c-dev \
-	uuid-dev \
+	libcomedi-dev \
 	libconfig-dev \
-	libnl-3-dev libnl-route-3-dev \
 	libcurl4-openssl-dev \
+	libfmt-dev \
+	libgraphviz-dev \
+	libhiredis-dev \
+	libibverbs-dev \
 	libjansson-dev \
-	libzmq3-dev \
+	liblua5.3-dev \
+	libmodbus-dev \
+	libmosquitto-dev \
 	libnanomsg-dev \
+	libnice-dev \
+	libnl-3-dev libnl-route-3-dev \
+	libprotobuf-c-dev \
+	libprotobuf-dev \
 	librabbitmq-dev \
-	libmosquitto-dev \
 	librdkafka-dev \
-	libcomedi-dev \
-	libibverbs-dev \
 	librdmacm-dev \
-	libusb-1.0-0-dev \
-	libfmt-dev \
 	libspdlog-dev \
-	liblua5.3-dev \
-	libhiredis-dev \
-	libnice-dev \
-	libmodbus-dev
+	libssl-dev \
+	libusb-1.0-0-dev \
+	libzmq3-dev \
+	uuid-dev
 
 # Install unpackaged dependencies from source
 ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.debian-multiarch

@@ -37,28 +37,28 @@ RUN apt-get update && \
 # Build-time dependencies
 RUN apt-get update && \
 	apt-get install -y \
-		libssl-dev:${ARCH} \
-		libgraphviz-dev:${ARCH} \
-		libprotobuf-dev:${ARCH} \
-		libprotobuf-c-dev:${ARCH} \
-		uuid-dev:${ARCH} \
-		libconfig-dev:${ARCH} \
-		libnl-3-dev \
-		libnl-route-3-dev:${ARCH} \
-		libcurl4-openssl-dev:${ARCH} \
-		libjansson-dev:${ARCH} \
-		libzmq3-dev:${ARCH} \
-		libnanomsg-dev:${ARCH} \
-		librabbitmq-dev:${ARCH} \
-		libmosquitto-dev:${ARCH} \
-		librdkafka-dev:${ARCH} \
-		libcomedi-dev:${ARCH} \
-		libibverbs-dev:${ARCH} \
-		librdmacm-dev:${ARCH} \
-		libusb-1.0-0-dev:${ARCH} \
-		liblua5.3-dev:${ARCH} \
-		libhiredis-dev:${ARCH} \
-		libmodbus-dev:${ARCH}
+	libcomedi-dev:${ARCH} \
+	libconfig-dev:${ARCH} \
+	libcurl4-openssl-dev:${ARCH} \
+	libgraphviz-dev:${ARCH} \
+	libhiredis-dev:${ARCH} \
+	libibverbs-dev:${ARCH} \
+	libjansson-dev:${ARCH} \
+	liblua5.3-dev:${ARCH} \
+	libmodbus-dev:${ARCH} \
+	libmosquitto-dev:${ARCH} \
+	libnanomsg-dev:${ARCH} \
+	libnl-3-dev \
+	libnl-route-3-dev:${ARCH} \
+	libprotobuf-c-dev:${ARCH} \
+	libprotobuf-dev:${ARCH} \
+	librabbitmq-dev:${ARCH} \
+	librdkafka-dev:${ARCH} \
+	librdmacm-dev:${ARCH} \
+	libssl-dev:${ARCH} \
+	libusb-1.0-0-dev:${ARCH} \
+	libzmq3-dev:${ARCH} \
+	uuid-dev:${ARCH}
 
 ADD cmake/toolchains/debian-${ARCH}.cmake /
 

packaging/docker/Dockerfile.fedora

@@ -41,31 +41,30 @@ RUN pip install \
 
 # Dependencies
 RUN dnf -y install \
-	openssl-devel \
-	libuuid-devel \
+	fmt-devel \
+	graphviz-devel \
+	hiredis-devel \
+	jansson-devel \
 	libconfig-devel \
-	libwebsockets-devel \
 	libcurl-devel \
-	jansson-devel \
-	spdlog-devel \
-	fmt-devel \
+	libibverbs-devel \
+	libmodbus-devel \
+	# nanomsg-devel \ # TODO: v1.2.1 seems broken. Re-enable once new version is available
+	libnice-devel \
 	libnl3-devel \
-	graphviz-devel \
-	protobuf-devel \
-	protobuf-c-devel \
-	zeromq-devel \
 	librabbitmq-devel \
-	mosquitto-devel \
 	librdkafka-devel \
-	libibverbs-devel \
 	librdmacm-devel \
 	libusb1-devel \
+	libuuid-devel \
+	libwebsockets-devel \
 	lua-devel \
-	hiredis-devel \
-	libnice-devel \
-	libmodbus-devel
-# TODO: v1.2.1 seems broken. Re-enable once new version is available
-# nanomsg-devel
+	mosquitto-devel \
+	openssl-devel \
+	protobuf-c-devel \
+	protobuf-devel \
+	spdlog-devel \
+	zeromq-devel
 
 # Install unpackaged dependencies from source
 # TODO: We currently need to build with GCC 14 to get OpenDSSC working

packaging/docker/Dockerfile.ubuntu

@@ -32,34 +32,34 @@ RUN apt-get update && \
 # Dependencies
 RUN apt-get update && \
 	apt-get install -y \
-	libssl-dev \
-	libgraphviz-dev \
-	libprotobuf-dev \
-	libprotobuf-c-dev \
-	uuid-dev \
+	libcomedi-dev \
 	libconfig-dev \
-	libnl-3-dev libnl-route-3-dev \
+	libcriterion-dev \
 	libcurl4-openssl-dev \
+	libfmt-dev \
+	libglib2.0-dev \
+	libgraphviz-dev \
+	libhiredis-dev \
+	libibverbs-dev \
 	libjansson-dev \
-	libzmq3-dev \
+	liblua5.3-dev \
+	libmodbus-dev \
+	libmosquitto-dev \
 	libnanomsg-dev \
+	libnice-dev \
+	libnl-3-dev libnl-route-3-dev \
+	libprotobuf-c-dev \
+	libprotobuf-dev \
 	librabbitmq-dev \
-	libmosquitto-dev \
 	librdkafka-dev \
-	libcomedi-dev \
-	libibverbs-dev \
 	librdmacm-dev \
+	libre2-dev \
+	libspdlog-dev \
+	libssl-dev \
 	libusb-1.0-0-dev \
 	libwebsockets-dev \
-	libfmt-dev \
-	libspdlog-dev \
-	liblua5.3-dev \
-	libhiredis-dev \
-	libnice-dev \
-	libmodbus-dev \
-	libre2-dev \
-	libglib2.0-dev \
-	libcriterion-dev
+	libzmq3-dev \
+	uuid-dev
 
 # Install unpackaged dependencies from source
 ADD packaging/patches /deps/patches