From c69c5f83175590718e9068037e874cdd80b77ea5 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 30 Apr 2020 22:23:41 -0700 Subject: [PATCH] ci: Update link to container in Docker registry Move Gitlab docker related files to .ci folder Reviewed-by: Joseph Nuthalapati --- Dockerfile.gitlabci => .ci/Dockerfile.gitlabci | 2 +- .ci/update-gitlabci-docker-image.sh | 9 +++++++++ .gitlab-ci.yml | 2 +- maintenance-scripts/update-gitlabci-docker-image.sh | 9 --------- 4 files changed, 11 insertions(+), 11 deletions(-) rename Dockerfile.gitlabci => .ci/Dockerfile.gitlabci (92%) create mode 100755 .ci/update-gitlabci-docker-image.sh delete mode 100755 maintenance-scripts/update-gitlabci-docker-image.sh diff --git a/Dockerfile.gitlabci b/.ci/Dockerfile.gitlabci similarity index 92% rename from Dockerfile.gitlabci rename to .ci/Dockerfile.gitlabci index 92eb95fc4..b628d8622 100644 --- a/Dockerfile.gitlabci +++ b/.ci/Dockerfile.gitlabci @@ -3,7 +3,7 @@ # This is an IaC pattern called "reheating a server template". # This is very fast but can accumulate cruft over time. # Use debian:testing if you want to build a fresh image. -FROM registry.salsa.debian.org/freedombox-team/plinth:gitlabci +FROM registry.salsa.debian.org/freedombox-team/freedombox:gitlabci USER root COPY . /plinth diff --git a/.ci/update-gitlabci-docker-image.sh b/.ci/update-gitlabci-docker-image.sh new file mode 100755 index 000000000..4143610b9 --- /dev/null +++ b/.ci/update-gitlabci-docker-image.sh @@ -0,0 +1,9 @@ +#! /bin/bash +# SPDX-License-Identifier: AGPL-3.0-or-later + +# Provide your Salsa credentials here +docker login registry.salsa.debian.org + +# This might need 20 minutes to run +docker build -t registry.salsa.debian.org/freedombox-team/freedombox:gitlabci -f .ci/Dockerfile.gitlabci . +docker push registry.salsa.debian.org/freedombox-team/freedombox:gitlabci diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a95327a3f..e9edd71a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -image: registry.salsa.debian.org/freedombox-team/plinth:gitlabci +image: registry.salsa.debian.org/freedombox-team/freedombox:gitlabci before_script: - export DEBIAN_FRONTEND=noninteractive diff --git a/maintenance-scripts/update-gitlabci-docker-image.sh b/maintenance-scripts/update-gitlabci-docker-image.sh deleted file mode 100755 index 7abfd10e0..000000000 --- a/maintenance-scripts/update-gitlabci-docker-image.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash -# SPDX-License-Identifier: AGPL-3.0-or-later - -# Provide your Salsa credentials here -docker login registry.salsa.debian.org - -# This might need 20 minutes to run -docker build -t registry.salsa.debian.org/freedombox-team/plinth:gitlabci -f Dockerfile.gitlabci . -docker push registry.salsa.debian.org/freedombox-team/plinth:gitlabci