fix: removed matrix

openedx · Oct 10, 2023 · 7082863 · 7082863
1 parent 250166e
commit 7082863
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/.github/workflows/docker-publish.yml b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/.github/workflows/docker-publish.yml
@@ -11,21 +11,21 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
 
-    strategy:
-      matrix:
-        variant:
-          - "cc"
-          - "cc_dev"
-
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build and push coockie-cutter base docker image
+      - name: Build and push coockie-cutter production docker image
+        env:
+          DOCKERHUB_PASSWORD: ${% raw %}{{ secrets.DOCKERHUB_PASSWORD }}{% endraw %}
+          DOCKERHUB_USERNAME: ${% raw %}{{ secrets.DOCKERHUB_USERNAME }}{% endraw %}
+        run : make docker_tag_build_push
+
+      - name: Build and push coockie-cutter development docker image
         env:
           DOCKERHUB_PASSWORD: ${% raw %}{{ secrets.DOCKERHUB_PASSWORD }}{% endraw %}
           DOCKERHUB_USERNAME: ${% raw %}{{ secrets.DOCKERHUB_USERNAME }}{% endraw %}
-        run : make docker_tag_build_push_${{matrix.variant}}
+        run : make docker_tag_build_push_dev
diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Makefile b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Makefile
@@ -184,10 +184,10 @@ db-shell: # Run the app shell as root, enter the app's database
 docker_auth:
 	echo "$$DOCKERHUB_PASSWORD" | docker login -u "$$DOCKERHUB_USERNAME" --password-stdin
 
-docker_tag_build_push_cc: docker_auth
+docker_tag_build_push: docker_auth
 	docker buildx build -t openedx/{{cookiecutter.repo_name}}:latest -t openedx/{{cookiecutter.repo_name}}:${GITHUB_SHA} --platform linux/amd64,linux/arm64 --build-arg SERVICE_VARIANT={{cookiecutter.repo_name}} --build-arg SERVICE_PORT={{cookiecutter.port}} --target production --push .
 
-docker_tag_build_push_cc_dev: docker_auth
+docker_tag_build_push_dev: docker_auth
 	docker buildx build -t openedx/{{cookiecutter.repo_name}}-dev:latest -t openedx/{{cookiecutter.repo_name}}-dev:${GITHUB_SHA} --platform linux/amd64,linux/arm64 --build-arg SERVICE_VARIANT={{cookiecutter.repo_name}} --build-arg SERVICE_PORT={{cookiecutter.port}} --target development --push .
 
 selfcheck: ## check that the Makefile is well-formed