From 4df826bcd23d9b9032574aa9f3b712986d0afbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Thu, 23 Mar 2023 10:54:26 +0000 Subject: [PATCH] Fix #47 Move the docker to an external repository --- .gitlab-ci-files/package.yml | 4 ++-- .gitlab-ci-files/test.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- docker/bc-dev-centos7-php.docker | 11 ----------- docker/bc-dev-debian11-php.docker | 14 -------------- docker/bc-dev-rocky8-php.docker | 10 ---------- 6 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 docker/bc-dev-centos7-php.docker delete mode 100644 docker/bc-dev-debian11-php.docker delete mode 100644 docker/bc-dev-rocky8-php.docker diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml index 461dc65..fc4f38f 100644 --- a/.gitlab-ci-files/package.yml +++ b/.gitlab-ci-files/package.yml @@ -1,12 +1,12 @@ rocky8-package: extends: .package - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:$ROCKY_8_IMAGE_VERSION + image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION script: - make rpm debian11-package: extends: .package - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:$DEBIAN_11_IMAGE_VERSION + image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION script: - make deb diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml index ed0d4fe..408f5b5 100644 --- a/.gitlab-ci-files/test.yml +++ b/.gitlab-ci-files/test.yml @@ -1,6 +1,6 @@ rocky8-test: extends: .test - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:$ROCKY_8_IMAGE_VERSION + image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION needs: - rocky8-package script: @@ -14,7 +14,7 @@ rocky8-test: debian11-test: extends: .test - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:$DEBIAN_11_IMAGE_VERSION + image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION needs: - debian11-package script: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ebacc0..930ab77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - ROCKY_8_IMAGE_VERSION: 20221212_php80 - DEBIAN_11_IMAGE_VERSION: 20221212_php82 + ROCKY_8_IMAGE_VERSION: 20230323_113930_add_git + DEBIAN_11_IMAGE_VERSION: 20230322_172926_missing_tools include: - '.gitlab-ci-files/package.yml' diff --git a/docker/bc-dev-centos7-php.docker b/docker/bc-dev-centos7-php.docker deleted file mode 100644 index 4a2a25e..0000000 --- a/docker/bc-dev-centos7-php.docker +++ /dev/null @@ -1,11 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 -USER root - -# Install Remi repository -RUN yum install -y https://rpms.remirepo.net/enterprise/remi-release-7.rpm -RUN yum-config-manager --enable remi-php80 -RUn yum -y update && yum -y upgrade - -# Install dependencies -RUN yum -y install centos-release-scl.noarch sysvinit-tools -RUN yum -y install php php-mbstring composer \ No newline at end of file diff --git a/docker/bc-dev-debian11-php.docker b/docker/bc-dev-debian11-php.docker deleted file mode 100644 index 783f02d..0000000 --- a/docker/bc-dev-debian11-php.docker +++ /dev/null @@ -1,14 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11:2022_10_13_update_docker_image -MAINTAINER Peio Rigaux -USER root - -# Install Sury repository -RUN curl -sSL https://packages.sury.org/php/README.txt | sudo bash -x - -# Install dependencies -RUN apt update && apt -y install php php-xml php-curl composer rsync - -# Setup the Debian repository -RUN apt install wget -RUN wget https://linphone.org/snapshots/debian/keyring.gpg -O - | sudo apt-key add - -RUN echo 'deb [arch=amd64] http://linphone.org/snapshots/debian '$(lsb_release -cs)' stable' > /etc/apt/sources.list.d/belledonne.list \ No newline at end of file diff --git a/docker/bc-dev-rocky8-php.docker b/docker/bc-dev-rocky8-php.docker deleted file mode 100644 index e1e53b1..0000000 --- a/docker/bc-dev-rocky8-php.docker +++ /dev/null @@ -1,10 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos8:2022_10_13_update_docker_image -USER root - -# Install Remi repository -RUN dnf -y update -RUN dnf -y install http://rpms.remirepo.net/enterprise/remi-release-8.5.rpm -RUN dnf module enable php:remi-8.0 -y - -# Install dependencies -RUN dnf -y install php php-mbstring composer \ No newline at end of file