testing/next cleanups (docker, functional)

[PATCH 01/16] tests/docker: drop --link from COPYs in emsdk docker

Posted by Alex Bennée 1 month ago

As we need to build images in both docker and podman lets not have any
incompatibilities. I don't think it makes any major difference.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/emsdk-wasm32-cross.docker | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker b/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
index 6b1642a207c..1f08eb0b855 100644
--- a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
+++ b/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
@@ -115,8 +115,8 @@ RUN mkdir -p /glib
 RUN curl -Lks https://download.gnome.org/sources/glib/${GLIB_MINOR_VERSION}/glib-$GLIB_VERSION.tar.xz | \
     tar xJC /glib --strip-components=1
 
-COPY --link --from=zlib-dev /builddeps/ /builddeps/
-COPY --link --from=libffi-dev /builddeps/ /builddeps/
+COPY --from=zlib-dev /builddeps/ /builddeps/
+COPY --from=libffi-dev /builddeps/ /builddeps/
 
 WORKDIR /glib
 RUN <<EOF
@@ -141,5 +141,5 @@ RUN sed -i -E "/#define HAVE_PTHREAD_GETNAME_NP 1/d" ./_build/config.h
 RUN meson install -C _build
 
 FROM build-base
-COPY --link --from=glib-dev /builddeps/ /builddeps/
-COPY --link --from=pixman-dev /builddeps/ /builddeps/
+COPY --from=glib-dev /builddeps/ /builddeps/
+COPY --from=pixman-dev /builddeps/ /builddeps/
-- 
2.47.3

Re: [PATCH 01/16] tests/docker: drop --link from COPYs in emsdk docker

Posted by Kohei Tokunaga 1 month ago

> As we need to build images in both docker and podman lets not have any
> incompatibilities. I don't think it makes any major difference.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/docker/dockerfiles/emsdk-wasm32-cross.docker | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
b/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
> index 6b1642a207c..1f08eb0b855 100644
> --- a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
> +++ b/tests/docker/dockerfiles/emsdk-wasm32-cross.docker
> @@ -115,8 +115,8 @@ RUN mkdir -p /glib
>  RUN curl -Lks
https://download.gnome.org/sources/glib/${GLIB_MINOR_VERSION}/glib-$GLIB_VERSION.tar.xz
| \
>      tar xJC /glib --strip-components=1
>
> -COPY --link --from=zlib-dev /builddeps/ /builddeps/
> -COPY --link --from=libffi-dev /builddeps/ /builddeps/
> +COPY --from=zlib-dev /builddeps/ /builddeps/
> +COPY --from=libffi-dev /builddeps/ /builddeps/
>
>  WORKDIR /glib
>  RUN <<EOF
> @@ -141,5 +141,5 @@ RUN sed -i -E "/#define HAVE_PTHREAD_GETNAME_NP 1/d"
./_build/config.h
>  RUN meson install -C _build
>
>  FROM build-base
> -COPY --link --from=glib-dev /builddeps/ /builddeps/
> -COPY --link --from=pixman-dev /builddeps/ /builddeps/
> +COPY --from=glib-dev /builddeps/ /builddeps/
> +COPY --from=pixman-dev /builddeps/ /builddeps/

Reviewed-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>

Regards,
Kohei Tokunaga