Skip to content

Commit 26c9d46

Browse files
stv0gstv0g
committed
fix(packaging): Update outdated LABELs
Signed-off-by: Steffen Vogel <[email protected]>
1 parent bbc951f commit 26c9d46

File tree

6 files changed

+54
-54
lines changed

6 files changed

+54
-54
lines changed

‎packaging/docker/Dockerfile.debian‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update && \
2424
flex bison \
2525
protobuf-compiler protobuf-c-compiler \
2626
clang-format clangd \
27-
python3-venv unzip
27+
python3-venv unzip
2828

2929
# Dependencies
3030
RUN apt-get update && \
@@ -88,10 +88,10 @@ LABEL \
8888
org.label-schema.schema-version="1.0" \
8989
org.label-schema.name="VILLASnode" \
9090
org.label-schema.license="Apache-2.0" \
91-
org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \
91+
org.label-schema.vendor="The VILLASframework authors" \
9292
org.label-schema.author.name="Steffen Vogel" \
9393
org.label-schema.author.email="[email protected]" \
94-
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \
94+
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Debian" \
9595
org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
96-
org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \
97-
org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"
96+
org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
97+
org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"

‎packaging/docker/Dockerfile.debian-multiarch‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ RUN dpkg --add-architecture ${ARCH}
2626
# Toolchain
2727
RUN apt-get update && \
2828
apt-get install -y \
29-
crossbuild-essential-${ARCH} \
30-
pkg-config cmake make \
31-
autoconf automake autogen libtool \
32-
texinfo git curl tar wget diffutils \
33-
flex bison \
34-
protobuf-compiler protobuf-c-compiler \
35-
clang-format clangd
29+
crossbuild-essential-${ARCH} \
30+
pkg-config cmake make \
31+
autoconf automake autogen libtool \
32+
texinfo git curl tar wget diffutils \
33+
flex bison \
34+
protobuf-compiler protobuf-c-compiler \
35+
clang-format clangd
3636

3737
# Build-time dependencies
3838
RUN apt-get update && \
@@ -126,30 +126,30 @@ RUN dpkg --add-architecture ${ARCH}
126126
# Run-time dependencies
127127
RUN apt-get update && \
128128
apt-get install -y \
129-
libgomp1:${ARCH} \
130-
libprotobuf-c1:${ARCH} \
131-
libssl1.1:${ARCH} \
132-
libcgraph6:${ARCH} \
133-
libcdt5:${ARCH} \
134-
libgvc6:${ARCH} \
135-
libuuid1:${ARCH} \
136-
libconfig9:${ARCH} \
137-
libnl-3-200:${ARCH} \
138-
libnl-route-3-200:${ARCH} \
139-
libcurl4:${ARCH} \
140-
libjansson4:${ARCH} \
141-
libzmq5:${ARCH} \
142-
libnanomsg5:${ARCH} \
143-
librabbitmq4:${ARCH} \
144-
libmosquitto1:${ARCH} \
145-
librdkafka1:${ARCH} \
146-
libcomedi0:${ARCH} \
147-
libibverbs1:${ARCH} \
148-
librdmacm1:${ARCH} \
149-
libusb-1.0-0:${ARCH} \
150-
liblua5.3-0:${ARCH} \
151-
libhiredis0.14:${ARCH} \
152-
libmodbus5:${ARCH} && \
129+
libgomp1:${ARCH} \
130+
libprotobuf-c1:${ARCH} \
131+
libssl1.1:${ARCH} \
132+
libcgraph6:${ARCH} \
133+
libcdt5:${ARCH} \
134+
libgvc6:${ARCH} \
135+
libuuid1:${ARCH} \
136+
libconfig9:${ARCH} \
137+
libnl-3-200:${ARCH} \
138+
libnl-route-3-200:${ARCH} \
139+
libcurl4:${ARCH} \
140+
libjansson4:${ARCH} \
141+
libzmq5:${ARCH} \
142+
libnanomsg5:${ARCH} \
143+
librabbitmq4:${ARCH} \
144+
libmosquitto1:${ARCH} \
145+
librdkafka1:${ARCH} \
146+
libcomedi0:${ARCH} \
147+
libibverbs1:${ARCH} \
148+
librdmacm1:${ARCH} \
149+
libusb-1.0-0:${ARCH} \
150+
liblua5.3-0:${ARCH} \
151+
libhiredis0.14:${ARCH} \
152+
libmodbus5:${ARCH} && \
153153
rm -rf /var/lib/apt/lists/*
154154

155155
COPY --from=builder ${PREFIX} ${PREFIX}
@@ -168,10 +168,10 @@ LABEL \
168168
org.label-schema.schema-version="1.0" \
169169
org.label-schema.name="VILLASnode" \
170170
org.label-schema.license="Apache-2.0" \
171-
org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \
171+
org.label-schema.vendor="The VILLASframework authors" \
172172
org.label-schema.author.name="Steffen Vogel" \
173173
org.label-schema.author.email="[email protected]" \
174-
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \
174+
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Debian" \
175175
org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
176-
org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \
177-
org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"
176+
org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
177+
org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"

‎packaging/docker/Dockerfile.fedora‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ LABEL \
134134
org.label-schema.schema-version="1.0" \
135135
org.label-schema.name="VILLASnode" \
136136
org.label-schema.license="Apache-2.0" \
137-
org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \
137+
org.label-schema.vendor="The VILLASframework authors" \
138138
org.label-schema.author.name="Steffen Vogel" \
139139
org.label-schema.author.email="[email protected]" \
140140
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \
141141
org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
142-
org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \
143-
org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"
142+
org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
143+
org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"

‎packaging/docker/Dockerfile.fedora-minimal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ LABEL \
5959
org.label-schema.schema-version="1.0" \
6060
org.label-schema.name="VILLASnode" \
6161
org.label-schema.license="Apache-2.0" \
62-
org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \
62+
org.label-schema.vendor="The VILLASframework authors" \
6363
org.label-schema.author.name="Steffen Vogel" \
6464
org.label-schema.author.email="[email protected]" \
65-
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \
65+
org.label-schema.description="A image containing minimal build-time dependencies for VILLASnode based on Fedora" \
6666
org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
67-
org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \
68-
org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"
67+
org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
68+
org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"

‎packaging/docker/Dockerfile.rocky‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ LABEL \
9292
org.label-schema.schema-version="1.0" \
9393
org.label-schema.name="VILLASnode" \
9494
org.label-schema.license="Apache-2.0" \
95-
org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \
95+
org.label-schema.vendor="The VILLASframework authors" \
9696
org.label-schema.author.name="Steffen Vogel" \
9797
org.label-schema.author.email="[email protected]" \
98-
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \
98+
org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Rocky Linux" \
9999
org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
100-
org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \
101-
org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"
100+
org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
101+
org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"

‎packaging/docker/Dockerfile.ubuntu‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ LABEL \
9595
org.label-schema.schema-version="1.0" \
9696
org.label-schema.name="VILLASnode" \
9797
org.label-schema.license="Apache-2.0" \
98-
org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \
98+
org.label-schema.vendor="The VILLASframework authors" \
9999
org.label-schema.author.name="Steffen Vogel" \
100100
org.label-schema.author.email="[email protected]" \
101101
org.label-schema.description="An image containing all build-time dependencies for VILLASnode based on Ubuntu" \
102102
org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
103-
org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \
104-
org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"
103+
org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
104+
org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"

0 commit comments

Comments
 (0)