Use hellofresh DockerHub org to push images (#13)

hellofresh · Feb 15, 2021 · 5803a8f · 5803a8f
1 parent d4a03cb
commit 5803a8f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,31 +22,31 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: hellofreshtech
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build and push Docker base image
         uses: docker/build-push-action@v2
         with:
-          tags: hellofreshtech/kangal-jmeter:latest
+          tags: hellofresh/kangal-jmeter:latest
           context: docker/jmeter-base
           file: docker/jmeter-base/Dockerfile
           push: true
 
       - name: Build and push Docker master image
         uses: docker/build-push-action@v2
         with:
-          tags: hellofreshtech/kangal-jmeter-master:latest
+          tags: hellofresh/kangal-jmeter-master:latest
           context: docker/jmeter-master
           file: docker/jmeter-master/Dockerfile
           push: true
 
       - name: Build and push Docker worker image
         uses: docker/build-push-action@v2
         with:
-          tags: hellofreshtech/kangal-jmeter-worker:latest
+          tags: hellofresh/kangal-jmeter-worker:latest
           context: docker/jmeter-worker
           file: docker/jmeter-worker/Dockerfile
           push: true
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -32,7 +32,7 @@ jobs:
           go-version: '^1.15'
 
       - name: Setup Kube in Docker
-        uses: engineerd/setup-kind@v0.4.0
+        uses: engineerd/setup-kind@v0.5.0
 
       - name: Setup latest Kangal release
         run: |
@@ -43,22 +43,21 @@ jobs:
           tar -xzf "/tmp/kangal-source.tar.gz" -C /tmp
           mv "/tmp/kangal-${VERSION}"/* .
           make apply-crd
-          sed -i "s/latest/local/" pkg/backends/jmeter/jmeter.go
           sed -i "s/Always/IfNotPresent/" pkg/backends/jmeter/resources.go
           make build
 
       - name: Build Docker base image
         uses: docker/[email protected]
         with:
-          repository: hellofreshtech/kangal-jmeter
+          repository: hellofresh/kangal-jmeter
           tags: local
           path: docker/jmeter-base
           push: false
 
       - name: Build Docker master image
         uses: docker/[email protected]
         with:
-          repository: hellofreshtech/kangal-jmeter-master
+          repository: hellofresh/kangal-jmeter-master
           tags: local
           path: docker/jmeter-master
           push: false
@@ -67,7 +66,7 @@ jobs:
       - name: Build Docker worker image
         uses: docker/[email protected]
         with:
-          repository: hellofreshtech/kangal-jmeter-worker
+          repository: hellofresh/kangal-jmeter-worker
           tags: local
           path: docker/jmeter-worker
           push: false
@@ -76,13 +75,17 @@ jobs:
       - name: Load docker images into kind cluster
         run: |
           docker images
-          kind load docker-image hellofreshtech/kangal-jmeter-master:local
-          kind load docker-image hellofreshtech/kangal-jmeter-worker:local
+          kind load docker-image hellofresh/kangal-jmeter-master:local
+          kind load docker-image hellofresh/kangal-jmeter-worker:local
 
       - name: Run Integration Test
         env:
           AWS_ENDPOINT_URL: "localhost:8081"
           AWS_BUCKET_NAME: "kangal-test"
+          JMETER_WORKER_IMAGE_NAME: "hellofresh/kangal-jmeter-worker"
+          JMETER_MASTER_IMAGE_NAME: "hellofresh/kangal-jmeter-master"
+          JMETER_WORKER_IMAGE_TAG: "local"
+          JMETER_MASTER_IMAGE_TAG: "local"
         run: |
           cd kangal
           ./ci/integration-tests.sh
diff --git a/docker/jmeter-master/Dockerfile b/docker/jmeter-master/Dockerfile
@@ -1,5 +1,5 @@
 ARG VERSION="latest"
-FROM hellofreshtech/kangal-jmeter:$VERSION
+FROM hellofresh/kangal-jmeter:$VERSION
 
 ARG JMETER_VERSION=5.0
 

diff --git a/docker/jmeter-worker/Dockerfile b/docker/jmeter-worker/Dockerfile
@@ -1,5 +1,5 @@
 ARG VERSION="latest"
-FROM hellofreshtech/kangal-jmeter:$VERSION
+FROM hellofresh/kangal-jmeter:$VERSION
 
 ARG JMETER_VERSION=5.0