From ca846bf55216098cc679f38a2f655ef149fec061 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Fri, 2 Dec 2022 15:51:47 +0500 Subject: [PATCH 1/4] build: push docker image to edxops/insights repo now --- .github/docker-compose-github.yml | 3 ++- .github/workflows/push-docker-images.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/docker-compose-github.yml b/.github/docker-compose-github.yml index d7007af75..f61cd508e 100644 --- a/.github/docker-compose-github.yml +++ b/.github/docker-compose-github.yml @@ -12,7 +12,8 @@ services: ELASTICSEARCH_LEARNERS_UPDATE_INDEX: 'index_update' command: /edx/app/analytics_api/venvs/analytics_api/bin/python /edx/app/analytics_api/analytics_api/manage.py runserver 0.0.0.0:80 --settings analyticsdataserver.settings.local insights: - image: edxops/insights:latest + #Temporary, just testing that CI works fine with Ansible free Image. + image: edxops/insights-dev:latest container_name: insights_testing volumes: - ..:/edx/app/insights/edx_analytics_dashboard diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml index 8e0c3be94..47a09bc94 100644 --- a/.github/workflows/push-docker-images.yml +++ b/.github/workflows/push-docker-images.yml @@ -34,7 +34,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} target: dev - repository: edxops/insights-dev + repository: edxops/insights tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }} # - name: Build and push prod Docker image @@ -44,5 +44,5 @@ jobs: # username: ${{ secrets.DOCKERHUB_USERNAME }} # password: ${{ secrets.DOCKERHUB_PASSWORD }} # target: prod - # repository: edxops/insights + # repository: edxops/insights-prod # tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }} From f8def2e82d996dd98775b023f7cae3b08ed0258d Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Fri, 2 Dec 2022 15:58:32 +0500 Subject: [PATCH 2/4] fix: remove temp change --- .github/docker-compose-github.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/docker-compose-github.yml b/.github/docker-compose-github.yml index f61cd508e..d7007af75 100644 --- a/.github/docker-compose-github.yml +++ b/.github/docker-compose-github.yml @@ -12,8 +12,7 @@ services: ELASTICSEARCH_LEARNERS_UPDATE_INDEX: 'index_update' command: /edx/app/analytics_api/venvs/analytics_api/bin/python /edx/app/analytics_api/analytics_api/manage.py runserver 0.0.0.0:80 --settings analyticsdataserver.settings.local insights: - #Temporary, just testing that CI works fine with Ansible free Image. - image: edxops/insights-dev:latest + image: edxops/insights:latest container_name: insights_testing volumes: - ..:/edx/app/insights/edx_analytics_dashboard From 6fe456771841616130cb6704fc8121646b55c9a2 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Mon, 5 Dec 2022 13:41:17 +0500 Subject: [PATCH 3/4] fix: try on Ansible free image --- .github/docker-compose-github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose-github.yml b/.github/docker-compose-github.yml index d7007af75..d99036803 100644 --- a/.github/docker-compose-github.yml +++ b/.github/docker-compose-github.yml @@ -12,7 +12,7 @@ services: ELASTICSEARCH_LEARNERS_UPDATE_INDEX: 'index_update' command: /edx/app/analytics_api/venvs/analytics_api/bin/python /edx/app/analytics_api/analytics_api/manage.py runserver 0.0.0.0:80 --settings analyticsdataserver.settings.local insights: - image: edxops/insights:latest + image: edxops/insights-dev:latest container_name: insights_testing volumes: - ..:/edx/app/insights/edx_analytics_dashboard From 5f0b07b811a5a8c37e73e40e88aabf5d9df40b59 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Mon, 12 Dec 2022 13:11:32 +0500 Subject: [PATCH 4/4] fix: fix temp change --- .github/docker-compose-github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose-github.yml b/.github/docker-compose-github.yml index d99036803..d7007af75 100644 --- a/.github/docker-compose-github.yml +++ b/.github/docker-compose-github.yml @@ -12,7 +12,7 @@ services: ELASTICSEARCH_LEARNERS_UPDATE_INDEX: 'index_update' command: /edx/app/analytics_api/venvs/analytics_api/bin/python /edx/app/analytics_api/analytics_api/manage.py runserver 0.0.0.0:80 --settings analyticsdataserver.settings.local insights: - image: edxops/insights-dev:latest + image: edxops/insights:latest container_name: insights_testing volumes: - ..:/edx/app/insights/edx_analytics_dashboard