From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id BAB8226F21 for ; Thu, 15 Aug 2019 21:46:20 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5REXPGu31ysX for ; Thu, 15 Aug 2019 21:46:20 -0400 (EDT) Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1838526EEB for ; Thu, 15 Aug 2019 21:46:20 -0400 (EDT) From: Alexander Turenko Subject: [tarantool-patches] [PATCH] gitlab-ci: fix building of Debian Buster image Date: Fri, 16 Aug 2019 04:46:00 +0300 Message-Id: <2e5a14a0b5d5bb2d42d713bfb0d127b379a3559c.1565919911.git.alexander.turenko@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: Kirill Yukhin Cc: Alexander Turenko , tarantool-patches@freelists.org, "Alexander V . Tikhonov" `apt-get update <...>` fails on Debian Buster on docker_bootstrap goal (see #4331 for the similar issue). Added a description how to change dependencies in .travis.mk. --- no issue https://github.com/tarantool/tarantool/tree/Totktonada/gitlab-ci-fix-docker-bootstrap .gitlab.mk | 2 +- .travis.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitlab.mk b/.gitlab.mk index 7199adf94..8f84b8ff2 100644 --- a/.gitlab.mk +++ b/.gitlab.mk @@ -52,7 +52,7 @@ export DEBIAN_STRETCH_DOCKERFILE define DEBIAN_BUSTER_DOCKERFILE FROM packpack/packpack:debian-buster COPY .travis.mk . -RUN make -f .travis.mk deps_buster_clang_8 +RUN make APT_EXTRA_FLAGS="--allow-releaseinfo-change-version --allow-releaseinfo-change-suite" -f .travis.mk deps_buster_clang_8 endef export DEBIAN_BUSTER_DOCKERFILE diff --git a/.travis.mk b/.travis.mk index c0c23b6d7..4825dbd92 100644 --- a/.travis.mk +++ b/.travis.mk @@ -45,6 +45,18 @@ docker_%: # Depends +# When dependencies in 'deps_debian' or 'deps_buster_clang_8' goal +# are changed, push a new docker image into GitLab Registry using +# the following command: +# +# $ make GITLAB_USER=foo -f .gitlab.mk docker_bootstrap +# +# It is highly recommended to only add dependencies (don't remove +# them), because all branches use the same latest image and it is +# often that a short-term branch is based on non-so-recent master +# commit, so the build requires old dependencies to be installed. +# See ce623a23416eb192ce70116fd14992e84e7ccbbe ('Enable GitLab CI +# testing') for more information. deps_debian: apt-get update ${APT_EXTRA_FLAGS} && apt-get install -y -f \ build-essential cmake coreutils sed \ -- 2.22.0