Skip to content

Commit 2006e8a

Browse files
committed
Move order processing app to root folder
1 parent 94acb07 commit 2006e8a

17 files changed

Lines changed: 8 additions & 10 deletions
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ __pycache__/
33
.env
44
.azure
55
.venv
6-
6+
images
7+
setup
8+
.devcontainer
79
Dockerfile
810
.github
9-
.gitlab-ci.yml
11+
.gitlab-ci.yml

.github/workflows/deploy.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,18 @@ jobs:
1212
DOCKERHUB_TOKEN: '${{ secrets.DOCKERHUB_TOKEN }}'
1313
AZURE_WEBHOOK: '${{ secrets.AZURE_WEBHOOK }}'
1414
# DECIDE WHETHER YOU WANT A BRANCH CHECK - if so remove the other "if"
15-
# if: github.ref == 'refs/heads/master'
16-
if: github.repository != 'corndeladmin/DevOps-Course-Workshop-Module-13-Learners'
15+
# if: github.ref == 'refs/heads/main'
16+
if: github.repository != 'corndeladmin/DevOps-Unit-10-Workshop'
1717
steps:
1818
- name: test
1919
run: echo ${{ github.repository }}
2020
- name: Checkout repo
2121
uses: actions/checkout@v3
2222
- name: Build image
23-
working-directory: order-processing-app
2423
run: docker build --tag ${DOCKERHUB_USERNAME}/unit-10-order-processing-app --target production .
2524
- name: Docker login
2625
run: echo $DOCKERHUB_TOKEN | docker login -u $DOCKERHUB_USERNAME --password-stdin
2726
- name: Push image
28-
working-directory: order-processing-app
2927
run: docker push ${DOCKERHUB_USERNAME}/unit-10-order-processing-app
3028
- name: Trigger deployment
3129
run: curl --fail-with-body -X POST "$AZURE_WEBHOOK"

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ This repository is for learners on Corndel's DevOps apprenticeship.
44

55
## Pre-requisites
66

7-
You need to have an Azure account. Contact a tutor if you do not have access to one.
8-
9-
Also, make sure you have installed the following:
7+
Make sure you have installed the following:
108
* [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
119
* Verify it is installed by running `az --version`
1210
* [Docker](https://docs.docker.com/get-started/get-docker/)
File renamed without changes.

0 commit comments

Comments
 (0)