diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ea101e6..54cca10 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ on: - 'v*' env: - DOCKER_REPO_NAME: kaw393939/mywebclass-practice + DOCKER_REPO_NAME: navyarangu/mywebclass-practice jobs: build: diff --git a/Dockerfile b/Dockerfile index 5a1ce1f..a9d35db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,3 @@ FROM httpd:2.4 COPY ./public_html/ /usr/local/apache2/htdocs/ + diff --git a/docker-compose.yml b/docker-compose.yml index 5090fad..950d8cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,37 +1,25 @@ version: "3.8" services: - master_branch: - image: kaw393939/mywebclass:master - container_name: master_branch + master: + image: navyarangu/mywebclass:master + deploy: + replicas: 2 pull_policy: always restart: always ports: - - "80:80" + - "80-81:80" labels: - 'com.centurylinklabs.watchtower.enable=true' - development_branch: - image: kaw393939/mywebclass:development - container_name: development_branch - pull_policy: always - restart: always - ports: - - "8000:80" - labels: - - 'com.centurylinklabs.watchtower.enable=true' - local_public_html_build: + development: build: . - container_name: local_public_html_build + container_name: development + pull_policy: always restart: always ports: - "8080:80" volumes: - ./public_html/:/usr/local/apache2/htdocs/ - local_app_build: - build: ./app - container_name: app - volumes: - - ./requirements.txt:/home/myuser/requirements.txt watchtower: image: containrrr/watchtower container_name: watchtower diff --git a/myinfo.json b/myinfo.json index 92c3d00..9fa94ad 100644 --- a/myinfo.json +++ b/myinfo.json @@ -1,8 +1,8 @@ { - "first_name": "change", - "last_name": "change", - "ucid": "change", - "github_id": "change", - "docker_id": "kaw393939" + "first_name": "navya", + "last_name": "rangu", + "ucid": "nr528", + "github_id": "navyarangu13", + "docker_id": "navyarangu" } \ No newline at end of file diff --git a/readme.md b/readme.md index 6834b8d..983da66 100644 --- a/readme.md +++ b/readme.md @@ -27,8 +27,9 @@ theirs. The end result is that each partner should have the experience of the te ### 3. Both Partners ACCEPT THE Assignment GITHUB to create their own GitHub repo, so each person has the chance to do all the steps and practice makes perfect... -1. Partner 1: [kwilliam](https://github.com/kaw393939) <-change to you or your partner -2. Partner 2: [kwilliam](https://github.com/kaw393939) <-change to you or your partner + +1. Partner 1: [sathvika](https://github.com/sathvikareddyg) <-change to you or your partner +2. Partner 2: [bhogeswari](https://github.com/bs227) <-change to you or your partner 3. Partner 3: Optional Complete this on each partner's repos for this assignment by following the development workflow process bellow. Since diff --git a/src/index.html b/src/index.html index a6524c3..7d6fa49 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,7 @@ - + @@ -34,7 +34,7 @@