Skip to content
Snippets Groups Projects
Commit 57fcebb0 authored by Lukasz Dorau's avatar Lukasz Dorau
Browse files

common: replace DOCKERHUB_REPO with DOCKER_REPO

parent 21be3e4e
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
......@@ -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:
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 \
......
......@@ -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}
......@@ -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}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment