From 27d1e768e59a85c67458dca09a7f790ad6e9445d Mon Sep 17 00:00:00 2001 From: Oleg Vasilev Date: Wed, 28 Aug 2019 15:48:38 +0300 Subject: gitlab-ci: rename Dockerfiles Dockerfile.build-* is consistent with build-* naming. Reviewed-by: Arkadiusz Hiler Signed-off-by: Oleg Vasilev --- .gitlab-ci.yml | 24 +++++++++++----------- Dockerfile.build-debian | 24 ++++++++++++++++++++++ Dockerfile.build-debian-arm64 | 39 +++++++++++++++++++++++++++++++++++ Dockerfile.build-debian-armhf | 39 +++++++++++++++++++++++++++++++++++ Dockerfile.build-debian-minimal | 25 +++++++++++++++++++++++ Dockerfile.build-debian-mips | 39 +++++++++++++++++++++++++++++++++++ Dockerfile.build-fedora | 45 +++++++++++++++++++++++++++++++++++++++++ Dockerfile.debian | 24 ---------------------- Dockerfile.debian-arm64 | 39 ----------------------------------- Dockerfile.debian-armhf | 39 ----------------------------------- Dockerfile.debian-minimal | 25 ----------------------- Dockerfile.debian-mips | 39 ----------------------------------- Dockerfile.fedora | 45 ----------------------------------------- 13 files changed, 223 insertions(+), 223 deletions(-) create mode 100644 Dockerfile.build-debian create mode 100644 Dockerfile.build-debian-arm64 create mode 100644 Dockerfile.build-debian-armhf create mode 100644 Dockerfile.build-debian-minimal create mode 100644 Dockerfile.build-debian-mips create mode 100644 Dockerfile.build-fedora delete mode 100644 Dockerfile.debian delete mode 100644 Dockerfile.debian-arm64 delete mode 100644 Dockerfile.debian-armhf delete mode 100644 Dockerfile.debian-minimal delete mode 100644 Dockerfile.debian-mips delete mode 100644 Dockerfile.fedora diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c4c8227..3433ca08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,8 @@ build-containers:build-debian: image: docker:stable only: changes: - - Dockerfile.debian-minimal - - Dockerfile.debian + - Dockefile.build-debian-minimal + - Dockefile.build-debian - .gitlab-ci.yml services: - docker:dind @@ -34,8 +34,8 @@ build-containers:build-debian: DOCKER_DRIVER: overlay2 script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal -t build-debian-minimal -f Dockerfile.debian-minimal . - - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockerfile.debian . + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal -t build-debian-minimal -f Dockefile.build-debian-minimal . + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian -f Dockefile.build-debian . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian @@ -44,7 +44,7 @@ build-containers:build-debian-armhf: image: docker:stable only: changes: - - Dockerfile.debian-armhf + - Dockefile.build-debian-armhf - .gitlab-ci.yml services: - docker:dind @@ -53,7 +53,7 @@ build-containers:build-debian-armhf: DOCKER_DRIVER: overlay2 script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf -f Dockerfile.debian-armhf . + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf -f Dockefile.build-debian-armhf . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-armhf build-containers:build-debian-arm64: @@ -61,7 +61,7 @@ build-containers:build-debian-arm64: image: docker:stable only: changes: - - Dockerfile.debian-arm64 + - Dockefile.build-debian-arm64 - .gitlab-ci.yml services: - docker:dind @@ -70,7 +70,7 @@ build-containers:build-debian-arm64: DOCKER_DRIVER: overlay2 script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 -f Dockerfile.debian-arm64 . + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 -f Dockefile.build-debian-arm64 . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-arm64 build-containers:build-debian-mips: @@ -78,7 +78,7 @@ build-containers:build-debian-mips: image: docker:stable only: changes: - - Dockerfile.debian-mips + - Dockefile.build-debian-mips - .gitlab-ci.yml services: - docker:dind @@ -87,7 +87,7 @@ build-containers:build-debian-mips: DOCKER_DRIVER: overlay2 script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips -f Dockerfile.debian-mips . + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips -f Dockefile.build-debian-mips . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-mips build-containers:build-fedora: @@ -95,7 +95,7 @@ build-containers:build-fedora: image: docker:stable only: changes: - - Dockerfile.fedora + - Dockefile.build-fedora - .gitlab-ci.yml services: - docker:dind @@ -104,7 +104,7 @@ build-containers:build-fedora: DOCKER_DRIVER: overlay2 script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora -f Dockerfile.fedora . + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora -f Dockefile.build-fedora . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora #################### BUILD ######################### diff --git a/Dockerfile.build-debian b/Dockerfile.build-debian new file mode 100644 index 00000000..2749b177 --- /dev/null +++ b/Dockerfile.build-debian @@ -0,0 +1,24 @@ +FROM build-debian-minimal + +RUN apt-get update +RUN apt-get install -y \ + libunwind-dev \ + libgsl-dev \ + libasound2-dev \ + libxmlrpc-core-c3-dev \ + libjson-c-dev \ + libcurl4-openssl-dev \ + python-docutils \ + valgrind \ + peg + +RUN apt-get install -t stretch-backports -y \ + libdrm-intel1 + +# autotools build deps +RUN apt-get install -y \ + autoconf \ + automake \ + xutils-dev \ + libtool \ + make diff --git a/Dockerfile.build-debian-arm64 b/Dockerfile.build-debian-arm64 new file mode 100644 index 00000000..c9fb28c8 --- /dev/null +++ b/Dockerfile.build-debian-arm64 @@ -0,0 +1,39 @@ +FROM debian:stretch-backports + +RUN apt-get update +RUN apt-get install -y \ + flex \ + bison \ + pkg-config \ + x11proto-dri2-dev \ + python-docutils \ + valgrind \ + peg + +RUN dpkg --add-architecture arm64 +RUN apt-get update +RUN apt-get install -y \ + gcc-aarch64-linux-gnu \ + libatomic1:arm64 \ + libpciaccess-dev:arm64 \ + libkmod-dev:arm64 \ + libprocps-dev:arm64 \ + libunwind-dev:arm64 \ + libdw-dev:arm64 \ + zlib1g-dev:arm64 \ + liblzma-dev:arm64 \ + libcairo-dev:arm64 \ + libpixman-1-dev:arm64 \ + libudev-dev:arm64 \ + libgsl-dev:arm64 \ + libasound2-dev:arm64 \ + libjson-c-dev:arm64 \ + libcurl4-openssl-dev:arm64 \ + libxrandr-dev:arm64 \ + libxv-dev:arm64 + +RUN apt-get install -t stretch-backports -y \ + meson \ + libdrm-dev:arm64 \ + qemu-user \ + qemu-user-static diff --git a/Dockerfile.build-debian-armhf b/Dockerfile.build-debian-armhf new file mode 100644 index 00000000..3a133d84 --- /dev/null +++ b/Dockerfile.build-debian-armhf @@ -0,0 +1,39 @@ +FROM debian:stretch-backports + +RUN apt-get update +RUN apt-get install -y \ + flex \ + bison \ + pkg-config \ + x11proto-dri2-dev \ + python-docutils \ + valgrind \ + peg + +RUN dpkg --add-architecture armhf +RUN apt-get update +RUN apt-get install -y \ + gcc-arm-linux-gnueabihf \ + libatomic1:armhf \ + libpciaccess-dev:armhf \ + libkmod-dev:armhf \ + libprocps-dev:armhf \ + libunwind-dev:armhf \ + libdw-dev:armhf \ + zlib1g-dev:armhf \ + liblzma-dev:armhf \ + libcairo-dev:armhf \ + libpixman-1-dev:armhf \ + libudev-dev:armhf \ + libgsl-dev:armhf \ + libasound2-dev:armhf \ + libjson-c-dev:armhf \ + libcurl4-openssl-dev:armhf \ + libxrandr-dev:armhf \ + libxv-dev:armhf + +RUN apt-get install -t stretch-backports -y \ + meson \ + libdrm-dev:armhf \ + qemu-user \ + qemu-user-static diff --git a/Dockerfile.build-debian-minimal b/Dockerfile.build-debian-minimal new file mode 100644 index 00000000..63844694 --- /dev/null +++ b/Dockerfile.build-debian-minimal @@ -0,0 +1,25 @@ +FROM debian:stretch-backports + +RUN apt-get update +RUN apt-get install -y \ + gcc \ + flex \ + bison \ + pkg-config \ + libatomic1 \ + libpciaccess-dev \ + libkmod-dev \ + libprocps-dev \ + libdw-dev \ + zlib1g-dev \ + liblzma-dev \ + libcairo-dev \ + libpixman-1-dev \ + libudev-dev \ + libxrandr-dev \ + libxv-dev \ + x11proto-dri2-dev + +RUN apt-get install -t stretch-backports -y \ + meson \ + libdrm-dev diff --git a/Dockerfile.build-debian-mips b/Dockerfile.build-debian-mips new file mode 100644 index 00000000..ee29f5f4 --- /dev/null +++ b/Dockerfile.build-debian-mips @@ -0,0 +1,39 @@ +FROM debian:stretch-backports + +RUN apt-get update +RUN apt-get install -y \ + flex \ + bison \ + pkg-config \ + x11proto-dri2-dev \ + python-docutils \ + valgrind \ + peg + +RUN dpkg --add-architecture mips +RUN apt-get update +RUN apt-get install -y \ + gcc-mips-linux-gnu \ + libatomic1:mips \ + libpciaccess-dev:mips \ + libkmod-dev:mips \ + libprocps-dev:mips \ + libunwind-dev:mips \ + libdw-dev:mips \ + zlib1g-dev:mips \ + liblzma-dev:mips \ + libcairo-dev:mips \ + libpixman-1-dev:mips \ + libudev-dev:mips \ + libgsl-dev:mips \ + libasound2-dev:mips \ + libjson-c-dev:mips \ + libcurl4-openssl-dev:mips \ + libxrandr-dev:mips \ + libxv-dev:mips + +RUN apt-get install -t stretch-backports -y \ + meson \ + libdrm-dev:mips \ + qemu-user \ + qemu-user-static diff --git a/Dockerfile.build-fedora b/Dockerfile.build-fedora new file mode 100644 index 00000000..fa27a623 --- /dev/null +++ b/Dockerfile.build-fedora @@ -0,0 +1,45 @@ +FROM fedora:30 + +RUN dnf install -y \ + gcc flex bison libatomic meson ninja-build xdotool \ + 'pkgconfig(libdrm)' \ + 'pkgconfig(pciaccess)' \ + 'pkgconfig(libkmod)' \ + 'pkgconfig(libprocps)' \ + 'pkgconfig(libunwind)' \ + 'pkgconfig(libdw)' \ + 'pkgconfig(pixman-1)' \ + 'pkgconfig(valgrind)' \ + 'pkgconfig(cairo)' \ + 'pkgconfig(libudev)' \ + 'pkgconfig(glib-2.0)' \ + 'pkgconfig(gsl)' \ + 'pkgconfig(alsa)' \ + 'pkgconfig(xmlrpc)' \ + 'pkgconfig(xmlrpc_util)' \ + 'pkgconfig(xmlrpc_client)' \ + 'pkgconfig(json-c)' \ + 'pkgconfig(gtk-doc)' \ + 'pkgconfig(xv)' \ + 'pkgconfig(xrandr)' \ + python3-docutils + +# We need peg to build overlay +RUN dnf install -y make +RUN mkdir /tmp/peg +WORKDIR /tmp/peg +# originaly from http://piumarta.com/software/peg/ +RUN curl -O https://intel-gfx-ci.01.org/mirror/peg/peg-0.1.18.tar.gz +RUN tar xf peg-0.1.18.tar.gz +RUN cd peg-0.1.18 && make PREFIX=/usr install +RUN rm -fr /tmp/peg + +# For compile-testing on clang +RUN dnf install -y clang + +# Meson version switching shenanigans +WORKDIR /usr/src +RUN curl -O https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/meson-0.47.0.tar.gz + +# Cleanup workdir +WORKDIR / diff --git a/Dockerfile.debian b/Dockerfile.debian deleted file mode 100644 index 2749b177..00000000 --- a/Dockerfile.debian +++ /dev/null @@ -1,24 +0,0 @@ -FROM build-debian-minimal - -RUN apt-get update -RUN apt-get install -y \ - libunwind-dev \ - libgsl-dev \ - libasound2-dev \ - libxmlrpc-core-c3-dev \ - libjson-c-dev \ - libcurl4-openssl-dev \ - python-docutils \ - valgrind \ - peg - -RUN apt-get install -t stretch-backports -y \ - libdrm-intel1 - -# autotools build deps -RUN apt-get install -y \ - autoconf \ - automake \ - xutils-dev \ - libtool \ - make diff --git a/Dockerfile.debian-arm64 b/Dockerfile.debian-arm64 deleted file mode 100644 index c9fb28c8..00000000 --- a/Dockerfile.debian-arm64 +++ /dev/null @@ -1,39 +0,0 @@ -FROM debian:stretch-backports - -RUN apt-get update -RUN apt-get install -y \ - flex \ - bison \ - pkg-config \ - x11proto-dri2-dev \ - python-docutils \ - valgrind \ - peg - -RUN dpkg --add-architecture arm64 -RUN apt-get update -RUN apt-get install -y \ - gcc-aarch64-linux-gnu \ - libatomic1:arm64 \ - libpciaccess-dev:arm64 \ - libkmod-dev:arm64 \ - libprocps-dev:arm64 \ - libunwind-dev:arm64 \ - libdw-dev:arm64 \ - zlib1g-dev:arm64 \ - liblzma-dev:arm64 \ - libcairo-dev:arm64 \ - libpixman-1-dev:arm64 \ - libudev-dev:arm64 \ - libgsl-dev:arm64 \ - libasound2-dev:arm64 \ - libjson-c-dev:arm64 \ - libcurl4-openssl-dev:arm64 \ - libxrandr-dev:arm64 \ - libxv-dev:arm64 - -RUN apt-get install -t stretch-backports -y \ - meson \ - libdrm-dev:arm64 \ - qemu-user \ - qemu-user-static diff --git a/Dockerfile.debian-armhf b/Dockerfile.debian-armhf deleted file mode 100644 index 3a133d84..00000000 --- a/Dockerfile.debian-armhf +++ /dev/null @@ -1,39 +0,0 @@ -FROM debian:stretch-backports - -RUN apt-get update -RUN apt-get install -y \ - flex \ - bison \ - pkg-config \ - x11proto-dri2-dev \ - python-docutils \ - valgrind \ - peg - -RUN dpkg --add-architecture armhf -RUN apt-get update -RUN apt-get install -y \ - gcc-arm-linux-gnueabihf \ - libatomic1:armhf \ - libpciaccess-dev:armhf \ - libkmod-dev:armhf \ - libprocps-dev:armhf \ - libunwind-dev:armhf \ - libdw-dev:armhf \ - zlib1g-dev:armhf \ - liblzma-dev:armhf \ - libcairo-dev:armhf \ - libpixman-1-dev:armhf \ - libudev-dev:armhf \ - libgsl-dev:armhf \ - libasound2-dev:armhf \ - libjson-c-dev:armhf \ - libcurl4-openssl-dev:armhf \ - libxrandr-dev:armhf \ - libxv-dev:armhf - -RUN apt-get install -t stretch-backports -y \ - meson \ - libdrm-dev:armhf \ - qemu-user \ - qemu-user-static diff --git a/Dockerfile.debian-minimal b/Dockerfile.debian-minimal deleted file mode 100644 index 63844694..00000000 --- a/Dockerfile.debian-minimal +++ /dev/null @@ -1,25 +0,0 @@ -FROM debian:stretch-backports - -RUN apt-get update -RUN apt-get install -y \ - gcc \ - flex \ - bison \ - pkg-config \ - libatomic1 \ - libpciaccess-dev \ - libkmod-dev \ - libprocps-dev \ - libdw-dev \ - zlib1g-dev \ - liblzma-dev \ - libcairo-dev \ - libpixman-1-dev \ - libudev-dev \ - libxrandr-dev \ - libxv-dev \ - x11proto-dri2-dev - -RUN apt-get install -t stretch-backports -y \ - meson \ - libdrm-dev diff --git a/Dockerfile.debian-mips b/Dockerfile.debian-mips deleted file mode 100644 index ee29f5f4..00000000 --- a/Dockerfile.debian-mips +++ /dev/null @@ -1,39 +0,0 @@ -FROM debian:stretch-backports - -RUN apt-get update -RUN apt-get install -y \ - flex \ - bison \ - pkg-config \ - x11proto-dri2-dev \ - python-docutils \ - valgrind \ - peg - -RUN dpkg --add-architecture mips -RUN apt-get update -RUN apt-get install -y \ - gcc-mips-linux-gnu \ - libatomic1:mips \ - libpciaccess-dev:mips \ - libkmod-dev:mips \ - libprocps-dev:mips \ - libunwind-dev:mips \ - libdw-dev:mips \ - zlib1g-dev:mips \ - liblzma-dev:mips \ - libcairo-dev:mips \ - libpixman-1-dev:mips \ - libudev-dev:mips \ - libgsl-dev:mips \ - libasound2-dev:mips \ - libjson-c-dev:mips \ - libcurl4-openssl-dev:mips \ - libxrandr-dev:mips \ - libxv-dev:mips - -RUN apt-get install -t stretch-backports -y \ - meson \ - libdrm-dev:mips \ - qemu-user \ - qemu-user-static diff --git a/Dockerfile.fedora b/Dockerfile.fedora deleted file mode 100644 index fa27a623..00000000 --- a/Dockerfile.fedora +++ /dev/null @@ -1,45 +0,0 @@ -FROM fedora:30 - -RUN dnf install -y \ - gcc flex bison libatomic meson ninja-build xdotool \ - 'pkgconfig(libdrm)' \ - 'pkgconfig(pciaccess)' \ - 'pkgconfig(libkmod)' \ - 'pkgconfig(libprocps)' \ - 'pkgconfig(libunwind)' \ - 'pkgconfig(libdw)' \ - 'pkgconfig(pixman-1)' \ - 'pkgconfig(valgrind)' \ - 'pkgconfig(cairo)' \ - 'pkgconfig(libudev)' \ - 'pkgconfig(glib-2.0)' \ - 'pkgconfig(gsl)' \ - 'pkgconfig(alsa)' \ - 'pkgconfig(xmlrpc)' \ - 'pkgconfig(xmlrpc_util)' \ - 'pkgconfig(xmlrpc_client)' \ - 'pkgconfig(json-c)' \ - 'pkgconfig(gtk-doc)' \ - 'pkgconfig(xv)' \ - 'pkgconfig(xrandr)' \ - python3-docutils - -# We need peg to build overlay -RUN dnf install -y make -RUN mkdir /tmp/peg -WORKDIR /tmp/peg -# originaly from http://piumarta.com/software/peg/ -RUN curl -O https://intel-gfx-ci.01.org/mirror/peg/peg-0.1.18.tar.gz -RUN tar xf peg-0.1.18.tar.gz -RUN cd peg-0.1.18 && make PREFIX=/usr install -RUN rm -fr /tmp/peg - -# For compile-testing on clang -RUN dnf install -y clang - -# Meson version switching shenanigans -WORKDIR /usr/src -RUN curl -O https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/meson-0.47.0.tar.gz - -# Cleanup workdir -WORKDIR / -- cgit v1.2.3