diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml new file mode 100644 index 0000000..baeaee4 --- /dev/null +++ b/.github/workflows/ansible-lint.yml @@ -0,0 +1,23 @@ +# .github/workflows/ansible-lint.yml +name: ansible-lint +on: + pull_request: + branches: ["main"] + push: + branches: ["main"] + +jobs: + build: + name: Ansible Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Install Ansible Lint + run: | + sudo apt-get update + sudo apt-get install -y python3-pip + pip install ansible-lint + + - name: Linting the ansible role + working-directory: url-shortener/playbook/roles/docker + run: ansible-lint -p . --exclude=tests/ diff --git a/url-shortener/frontend-servers/compose.yaml b/url-shortener/frontend-servers/compose.yaml index 628d147..8caf447 100644 --- a/url-shortener/frontend-servers/compose.yaml +++ b/url-shortener/frontend-servers/compose.yaml @@ -36,4 +36,4 @@ services: ports: - "3000:3000" depends_on: - - proxy + - proxy \ No newline at end of file diff --git a/url-shortener/servers/compose.yaml b/url-shortener/servers/compose.yaml index 17b15bd..06cb89a 100644 --- a/url-shortener/servers/compose.yaml +++ b/url-shortener/servers/compose.yaml @@ -1,6 +1,6 @@ services: go: - image: 4b33b091a935 + image: 4b33b091a935 # replace with image/local-tagid # build: # context: go/ # dockerfile: Dockerfile @@ -8,7 +8,7 @@ services: - "1234:1234" express: - image: feb890d9439b + image: feb890d9439b # replace with image/local-tagid # build: # context: express-js/ # dockerfile: Dockerfile diff --git a/url-shortener/servers/proxy/urlShort.conf b/url-shortener/servers/proxy/urlShort.conf index 762028b..46b3181 100644 --- a/url-shortener/servers/proxy/urlShort.conf +++ b/url-shortener/servers/proxy/urlShort.conf @@ -1,7 +1,6 @@ upstream backend { - least_conn; server go:1234; - server go:5678; + server express:5678; } server {