diff --git a/.github/workflows/push-to-dokku.yml b/.github/workflows/push-to-dokku.yml index 133b07dd6..0e81a7cf1 100644 --- a/.github/workflows/push-to-dokku.yml +++ b/.github/workflows/push-to-dokku.yml @@ -3,11 +3,11 @@ name: Push to Dokku on: workflow_call: inputs: - remote_url: + git_remote_url: required: true type: string description: "The remote URL to push to" - image_name: + deploy_docker_image: required: true type: string description: "The name of the image to push" @@ -20,6 +20,6 @@ jobs: - name: Push uses: dokku/github-action@v1.4.0 with: - git_remote_url: ${{ inputs.remote_url }} + git_remote_url: ${{ inputs.git_remote_url }} ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} - deploy_docker_image: ${{ inputs.image_name }} + deploy_docker_image: ${{ inputs.deploy_docker_image }} diff --git a/.github/workflows/techlabblog-deploy-dev.yml b/.github/workflows/techlabblog-deploy-dev.yml index c932bf9fc..fa6c9a2ad 100644 --- a/.github/workflows/techlabblog-deploy-dev.yml +++ b/.github/workflows/techlabblog-deploy-dev.yml @@ -1,4 +1,4 @@ -name: Techlab Blog | Deploy Dev +name: Techlab Blog | Dev | Deploy on: push: @@ -13,38 +13,23 @@ concurrency: group: "${{ github.workflow }} @ ${{ github.ref }}" cancel-in-progress: true -env: - SENTRY_ENVIRONMENT: "development" - jobs: - env-setup: - name: Environment Setup - runs-on: ubuntu-latest - outputs: - SENTRY_ENVIRONMENT: ${{ steps.env-setup.outputs.SENTRY_ENVIRONMENT }} - steps: - - name: Environment Setup - id: env-setup - run: | - echo "SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}" >> $GITHUB_ENV - build-docker-image: name: Build Docker Image - needs: [env-setup] uses: ./.github/workflows/build-docker-image.yml secrets: inherit with: tags: "codeforafrica/techlabblog:${{ github.sha }}" target: "techlabblog-runner" build_args: | - SENTRY_ENVIRONMENT=${{ needs.env-setup.outputs.SENTRY_ENVIRONMENT }} + SENTRY_ENVIRONMENT=development SENTRY_DSN: ${{ vars.TECHLABBLOG_SENTRY_DSN }} push-to-dokku: name: Push to Dokku - needs: [build-docker-image, env-setup] + needs: [build-docker-image] uses: ./.github/workflows/push-to-dokku.yml secrets: inherit with: - remote_url: "ssh://azureuser@ui-1.dev.codeforafrica.org/techlabblog" - image_name: "codeforafrica/techlabblog:${{ github.sha }}" + git_remote_url: "ssh://azureuser@ui-1.dev.codeforafrica.org/techlabblog-ui" + deploy_docker_image: "codeforafrica/techlabblog:${{ github.sha }}" diff --git a/Makefile b/Makefile index 13ef6f030..ecdbd18f5 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,9 @@ pesayetu: roboshield: $(COMPOSE_BUILD_ENV) $(COMPOSE) --env-file apps/roboshield/.env.local up roboshield --build +techlabblog: + $(COMPOSE_BUILD_ENV) $(COMPOSE) --env-file apps/techlabblog/.env.local up techlabblog --build + vpnmanager: $(COMPOSE_BUILD_ENV) $(COMPOSE) --env-file apps/vpnmanager/.env.local up vpnmanager --build -techlabblog: - $(COMPOSE_BUILD_ENV) $(COMPOSE) --env-file apps/techlabblog/.env.local up techlabblog --build