From a209e77fc2c189c251fa90eebdce0f16ff4f6f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 26 Jan 2018 00:35:08 +0100 Subject: Rename a few CI things to a useful names --- .gitlab-ci.yml | 6 +++--- docker/biboumi-test/archlinux/Dockerfile | 13 ------------- docker/packaging/archlinux/Dockerfile | 13 +++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 docker/biboumi-test/archlinux/Dockerfile create mode 100644 docker/packaging/archlinux/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31fa61e..8a0a04e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,7 +101,7 @@ build:6: UDNS: "-DWITHOUT_UDNS=1" <<: *fedora_build -build:7: +build:without_udns: variables: UDNS: "-DWITHOUT_UDNS=1" <<: *fedora_build @@ -144,7 +144,7 @@ test:without_udns: image: docker.louiz.org/louiz/biboumi/test-fedora:latest <<: *basic_test dependencies: - - build:7 + - build:without_udns test:alpine: image: docker.louiz.org/louiz/biboumi/test-alpine:latest @@ -248,7 +248,7 @@ packaging:archlinux: tags: - docker allow_failure: true - image: docker.louiz.org/louiz/biboumi/test-archlinux:latest + image: docker.louiz.org/louiz/biboumi/packaging-archlinux:latest before_script: [] script: - sudo pacman -Syuu --noconfirm diff --git a/docker/biboumi-test/archlinux/Dockerfile b/docker/biboumi-test/archlinux/Dockerfile deleted file mode 100644 index 20f0343..0000000 --- a/docker/biboumi-test/archlinux/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM docker.io/base/archlinux:latest - -RUN pacman -Syuuuu --noconfirm - -RUN pacman -Syu --noconfirm cmake base-devel git clang-tools-extra - -RUN useradd -m -G wheel -s /bin/bash builder - -RUN sed -i '/^# %wheel ALL=(ALL) NOPASSWD: ALL/s/^# //' /etc/sudoers - -WORKDIR /home/builder - -USER builder diff --git a/docker/packaging/archlinux/Dockerfile b/docker/packaging/archlinux/Dockerfile new file mode 100644 index 0000000..20f0343 --- /dev/null +++ b/docker/packaging/archlinux/Dockerfile @@ -0,0 +1,13 @@ +FROM docker.io/base/archlinux:latest + +RUN pacman -Syuuuu --noconfirm + +RUN pacman -Syu --noconfirm cmake base-devel git clang-tools-extra + +RUN useradd -m -G wheel -s /bin/bash builder + +RUN sed -i '/^# %wheel ALL=(ALL) NOPASSWD: ALL/s/^# //' /etc/sudoers + +WORKDIR /home/builder + +USER builder -- cgit v1.2.3