Setup for dockerhub

ApiTreeCZ · May 24, 2018 · eca7155 · eca7155
1 parent 24c01f8
commit eca7155
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,10 +7,10 @@ jobs:
       - checkout
       - run:
           name: Docker login
-          command: DOCKER_USER=${JFROG_USER} DOCKER_PASS=${JFROG_PASS} DOCKER_URL=${JFROG_DOCKER_REPO} make docker-login
+          command: DOCKER_USER=${DOCKER_USER} DOCKER_PASS=${DOCKER_PASS} make docker-login
       - run:
           name: Set docker image to workspace
-          command: mkdir -p workspace && echo "${JFROG_DOCKER_REPO}/${CIRCLE_PROJECT_REPONAME}" > workspace/docker-image
+          command: mkdir -p workspace && echo "${DOCKER_USER}/${CIRCLE_PROJECT_REPONAME}" > workspace/docker-image
       - run:
           name: Show docker image
           command: cat workspace/docker-image
@@ -26,7 +26,7 @@ workflows:
   build:
     jobs:
       - create_docker_image:
-          context: apitree-aldo-context
+          context: apitree-dockerhub-context
           filters:
             tags:
               only: /v[0-9]+(\.[0-9]+)*(-.+)?/

diff --git a/Makefile b/Makefile
@@ -3,15 +3,15 @@ default: create-docker
 # only for local testing
 test-build:
 	@echo "Test docker build"
-	docker build -t apitree-docker-local.jfrog.io/k8s-helm-jfrog:latest .
+	docker build -t apitreecz/k8s-helm-jfrog:latest .
 
 # only for local testing
 test-go:
-	docker run -dit apitree-docker-local.jfrog.io/k8s-helm-jfrog:latest
+	docker run -dit apitreecz/k8s-helm-jfrog:latest
 
 docker-login:
 	@echo "Login to docker remote repository"
-	docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} ${DOCKER_URL}
+	docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
 
 docker-build:
 	@echo "Build docker image"