From 57fcebb0d722609c58ad54307d6ce8497a1daaa6 Mon Sep 17 00:00:00 2001
From: Lukasz Dorau <lukasz.dorau@intel.com>
Date: Sat, 10 Oct 2020 12:57:39 +0200
Subject: [PATCH] common: replace DOCKERHUB_REPO with DOCKER_REPO
---
.github/workflows/coverity.yml | 4 ++--
.github/workflows/gha.yml | 4 ++--
.travis.yml | 2 +-
utils/docker/build-CI.sh | 2 +-
utils/docker/build-local.sh | 4 ++--
utils/docker/images/build-image.sh | 8 ++++----
utils/docker/images/push-image.sh | 10 +++++-----
utils/docker/pull-or-rebuild-image.sh | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index f69783b93..338d535c2 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -7,8 +7,8 @@ on:
- cron: '0 0 * * *'
env:
- GITHUB_REPO: pmem/pmdk
- DOCKERHUB_REPO: pmem/pmdk
+ GITHUB_REPO: pmem/pmdk
+ DOCKER_REPO: pmem/pmdk
jobs:
linux:
diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml
index 402d4f878..dfdaf281b 100644
--- a/.github/workflows/gha.yml
+++ b/.github/workflows/gha.yml
@@ -3,8 +3,8 @@ name: PMDK
on: [push, pull_request]
env:
- GITHUB_REPO: pmem/pmdk
- DOCKERHUB_REPO: pmem/pmdk
+ GITHUB_REPO: pmem/pmdk
+ DOCKER_REPO: pmem/pmdk
jobs:
linux:
diff --git a/.travis.yml b/.travis.yml
index caa2313e2..e5de2ab16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ services:
env:
global:
- GITHUB_REPO=pmem/pmdk
- - DOCKERHUB_REPO=pmem/pmdk
+ - DOCKER_REPO=pmem/pmdk
- OS=ubuntu
- OS_VER=19.10
- MAKE_PKG=0
diff --git a/utils/docker/build-CI.sh b/utils/docker/build-CI.sh
index 1b75d3b94..f0b2c56d2 100755
--- a/utils/docker/build-CI.sh
+++ b/utils/docker/build-CI.sh
@@ -45,7 +45,7 @@ if [[ -z "$TEST_BUILD" ]]; then
TEST_BUILD=all
fi
-imageName=${DOCKERHUB_REPO}:1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}
+imageName=${DOCKER_REPO}:1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}
containerName=pmdk-${OS}-${OS_VER}
if [[ $MAKE_PKG -eq 0 ]] ; then command="./run-build.sh"; fi
diff --git a/utils/docker/build-local.sh b/utils/docker/build-local.sh
index 0fa5b2107..f80550175 100755
--- a/utils/docker/build-local.sh
+++ b/utils/docker/build-local.sh
@@ -34,7 +34,7 @@ export PMDK_CC=${PMDK_CC:-gcc}
export PMDK_CXX=${PMDK_CXX:-g++}
export EXPERIMENTAL=${EXPERIMENTAL:-n}
export VALGRIND=${VALGRIND:-1}
-export DOCKERHUB_REPO=${DOCKERHUB_REPO:-pmem/pmdk}
+export DOCKER_REPO=${DOCKER_REPO:-pmem/pmdk}
export GITHUB_REPO=${GITHUB_REPO:-pmem/pmdk}
if [[ -z "$OS" || -z "$OS_VER" ]]; then
@@ -51,7 +51,7 @@ if [[ "$KEEP_CONTAINER" != "1" ]]; then
RM_SETTING=" --rm"
fi
-imageName=${DOCKERHUB_REPO}:1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}
+imageName=${DOCKER_REPO}:1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}
containerName=pmdk-${OS}-${OS_VER}
if [[ $MAKE_PKG -eq 1 ]] ; then
diff --git a/utils/docker/images/build-image.sh b/utils/docker/images/build-image.sh
index b9e7a2a4b..5805d8f45 100755
--- a/utils/docker/images/build-image.sh
+++ b/utils/docker/images/build-image.sh
@@ -40,13 +40,13 @@ if [[ ! -f "Dockerfile.$OS_VER" ]]; then
exit 1
fi
-if [[ -z "${DOCKERHUB_REPO}" ]]; then
- echo "Error: DOCKERHUB_REPO environment variable is not set"
+if [[ -z "${DOCKER_REPO}" ]]; then
+ echo "Error: DOCKER_REPO environment variable is not set"
exit 1
fi
-# Build a Docker image tagged with ${DOCKERHUB_REPO}:OS-VER-ARCH
-tag=${DOCKERHUB_REPO}:1.10-${OS_VER}-${CPU_ARCH}
+# Build a Docker image tagged with ${DOCKER_REPO}:OS-VER-ARCH
+tag=${DOCKER_REPO}:1.10-${OS_VER}-${CPU_ARCH}
docker build -t $tag \
--build-arg http_proxy=$http_proxy \
--build-arg https_proxy=$https_proxy \
diff --git a/utils/docker/images/push-image.sh b/utils/docker/images/push-image.sh
index 03b935213..77292d4cc 100755
--- a/utils/docker/images/push-image.sh
+++ b/utils/docker/images/push-image.sh
@@ -29,18 +29,18 @@ if [[ -z "$CI_CPU_ARCH" ]]; then
exit 1
fi
-if [[ -z "${DOCKERHUB_REPO}" ]]; then
- echo "DOCKERHUB_REPO environment variable is not set"
+if [[ -z "${DOCKER_REPO}" ]]; then
+ echo "DOCKER_REPO environment variable is not set"
exit 1
fi
TAG="1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}"
# Check if the image tagged with pmdk/OS-VER exists locally
-if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:${TAG}\$" \
+if [[ ! $(docker images -a | awk -v pattern="^${DOCKER_REPO}:${TAG}\$" \
'$1":"$2 ~ pattern') ]]
then
- echo "ERROR: Docker image tagged ${DOCKERHUB_REPO}:${TAG} does not exists locally."
+ echo "ERROR: Docker image tagged ${DOCKER_REPO}:${TAG} does not exists locally."
exit 1
fi
@@ -48,4 +48,4 @@ fi
docker login -u="$DOCKERHUB_USER" -p="$DOCKERHUB_PASSWORD"
# Push the image to the repository
-docker push ${DOCKERHUB_REPO}:${TAG}
+docker push ${DOCKER_REPO}:${TAG}
diff --git a/utils/docker/pull-or-rebuild-image.sh b/utils/docker/pull-or-rebuild-image.sh
index a3a23cdd1..79c63ad16 100755
--- a/utils/docker/pull-or-rebuild-image.sh
+++ b/utils/docker/pull-or-rebuild-image.sh
@@ -109,4 +109,4 @@ done
# Getting here means rebuilding the Docker image is not required.
# Pull the image from Docker Hub.
-docker pull ${DOCKERHUB_REPO}:1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}
+docker pull ${DOCKER_REPO}:1.10-${OS}-${OS_VER}-${CI_CPU_ARCH}
--
GitLab