Skip to content

Merge CI / CD Changes from Development #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thattonBL merged 3 commits into from
Dec 18, 2024
Merged

Merge CI / CD Changes from Development #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34ac6b6
Update azure-pipelines.yml for Azure Pipelines
thattonBL Dec 18, 2024
4429a83
Update development.yaml
thattonBL Dec 18, 2024
9021262
Merge branch 'main' into development
thattonBL Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
# Step 3: Build the Docker image
- name: Build Docker image
run: |
docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:latest -f ./Dockerfile .
docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:dev -f ./Dockerfile .
# Step 4: Push Docker image to Docker Hub
- name: Push Docker image to Docker Hub
run: |
docker push ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:develop
docker push ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:dev
# Step 5: Trigger Azure Release Pipeline
- name: Trigger Azure DevOps Pipeline
uses: Azure/pipelines@v1.2
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
echo "Determining Azure subscription..."
if [ "$(Build.SourceBranchName)" = "development" ]; then
echo "##vso[task.setvariable variable=AZURE_SUBSCRIPTION]Dev-Gateway-Resources-MS"
echo "##vso[task.setvariable variable=DOCKER_IMAGE]attonbomb/systemadmin:develop"
echo "##vso[task.setvariable variable=DOCKER_IMAGE]attonbomb/systemadmin:dev"
else
echo "##vso[task.setvariable variable=AZURE_SUBSCRIPTION]Gateway-Resources-IAC-MI-Conn-2"
fi
Expand All @@ -39,7 +39,7 @@ steps:
az containerapp update \
--name gateway-global-integration-ui-iac
--resource-group Gateway-IAC-Resources
--image attonbomb/systemadmin:latest
--image $(DOCKER_IMAGE)
--registry-server hub.docker.com

echo "Global Integration API Container App updated successfully"
Expand Down
Loading