diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index c3e5d3176..e4d40eda9 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -1,7 +1,7 @@ name: Python application on: - push: + pull_request: paths: - 'python/*' @@ -23,6 +23,6 @@ jobs: - name: Build & Push Image run: | cd ./python - echo "${{ secrets.DOCKERPW }}" | docker login -u "[your dockerhub login here]" --password-stdin - docker image build -t [your dockerhub username here]/gitops:hellov1.0 . - docker push [your docker hub username here]/gitops:hellov1.0 + docker login --username=nmbiren --password=${{ secrets.DOCKERPW }} + docker image build -t nmbiren/containerimages1:hellov1.5 . + docker push nmbiren/containerimages1:hellov1.5 diff --git a/production/hello.yaml b/production/hello.yaml new file mode 100644 index 000000000..de9ff7035 --- /dev/null +++ b/production/hello.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: hello + namespace: lasample + labels: + app: hello +spec: + selector: + matchLabels: + app: hello + template: + metadata: + labels: + app: hello + spec: + containers: + - name: hello + image: linuxacademycontent/gitops:hellov1.1 diff --git a/python/app.py b/python/app.py index 358088e4c..8fe388785 100644 --- a/python/app.py +++ b/python/app.py @@ -2,8 +2,7 @@ app = Flask(__name__) @app.route("/") -def hello(): - return "Hello World!" - +def hello() + return "Hello, does this work?" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) diff --git a/qa/hello.yaml b/qa/hello.yaml new file mode 100644 index 000000000..337d5793c --- /dev/null +++ b/qa/hello.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: hello + namespace: lasample + labels: + app: hello +spec: + selector: + matchLabels: + app: hello + template: + metadata: + labels: + app: hello + spec: + containers: + - name: hello + image: linuxacademycontent/gitops:hellov1.2