Skip to content

Commit

Permalink
Merge pull request #9 from kunalmemane/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
kunalmemane authored Jan 21, 2025
2 parents ec8c308 + 61075ac commit 2abd0fb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/development-cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ jobs:
- name: s2i-build
run: |
sudo s2i build . quay.io/rh-ee-kmemane/go-s2i-builder quay.io/rh-ee-kmemane/area-calculator-development
sudo s2i build . quay.io/kmemane/go-s2i-builder quay.io/kmemane/area-calculator-development
sudo docker images
# Push Image to Quay registry
- name: Push Application image to quay
run: |
sudo docker login quay.io -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}"
sudo docker push quay.io/rh-ee-kmemane/area-calculator-development
sudo docker push quay.io/kmemane/area-calculator-development
# deploy application in ocp cluster
- name: Authenticate and set context
Expand All @@ -62,7 +62,7 @@ jobs:
echo "deleted all resources with label app=area-calculator-dev";
fi
oc new-app quay.io/rh-ee-kmemane/area-calculator-development --name=area-calculator-dev --labels=app=area-calculator-dev,env=dev
oc new-app quay.io/kmemane/area-calculator-development --name=area-calculator-dev --labels=app=area-calculator-dev,env=dev
oc expose svc area-calculator-dev --labels=env=dev
oc get routes -l app=area-calculator-dev
6 changes: 3 additions & 3 deletions .github/workflows/main-merge-cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:
- name: s2i-build
run: |
sudo s2i build . quay.io/rh-ee-kmemane/go-s2i-builder quay.io/rh-ee-kmemane/area-calculator
sudo s2i build . quay.io/kmemane/go-s2i-builder quay.io/kmemane/area-calculator
sudo docker images
- name: Push Application image to quay
run: |
sudo docker login quay.io -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}"
sudo docker push quay.io/rh-ee-kmemane/area-calculator
sudo docker push quay.io/kmemane/area-calculator
# deploy application in ocp cluster
- name: Authenticate and set context
Expand All @@ -62,7 +62,7 @@ jobs:
echo "deleted all resources with label app=area-calculator-prod";
fi
oc new-app quay.io/rh-ee-kmemane/area-calculator --name=area-calculator-prod --labels=app=area-calculator-prod,env=prod
oc new-app quay.io/kmemane/area-calculator --name=area-calculator-prod --labels=app=area-calculator-prod,env=prod
oc expose svc area-calculator-prod --labels=env=prod
oc get routes -l app=area-calculator-prod
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

APP_NAME = area-calculator
IMAGE_REGISTRY = quay.io
IMAGE_TAG = $(IMAGE_REGISTRY)/rh-ee-kmemane/$(APP_NAME)
IMAGE_TAG = $(IMAGE_REGISTRY)/kmemane/$(APP_NAME)

help:
@echo "Make - Area Calculator:"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ This project includes a `Makefile` to simplify common tasks. You can use the fol
- **`make test`**: Run the tests for the project.
- **`make clean`**: Remove build artifacts.
- **`make all`**: To do clean, test, build, run tasks in one command.
- **`podman-build`**: Build Application Image using Podman.
- **`podman-run`**: Run Application Container Image.
- **`podman-push`**: Push Application Image to quay.io _**- podman login required.**_
- **`oc-deploy`**: Deploy application to openshift using docker strategy _**- oc login required.**_
- **`oc-delete`**: Delete all resources in openshift project _**- oc login required.**_
- **`make podman-build`**: Build Application Image using Podman.
- **`make podman-run`**: Run Application Container Image.
- **`make podman-push`**: Push Application Image to quay.io _**- podman login required.**_
- **`make oc-deploy`**: Deploy application to openshift using docker strategy _**- oc login required.**_
- **`make oc-delete`**: Delete all resources in openshift project _**- oc login required.**_

## Contribute
Contributions are welcome! Please feel free to submit a Pull Request or open an Issue for discussion.
Expand Down

0 comments on commit 2abd0fb

Please sign in to comment.