From 7d4c6dcf6c58e9a39bf417076c7e68d84e5da7c5 Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:35:43 -0700 Subject: [PATCH 1/7] Update main.yml --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a3fa67..b15e8ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,5 +9,23 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{secrets.jarrettgaither}} + password: ${{secrets.Aceofspades45?}} + + - name: Build Image + run: docker build -t jarrettgaither/liatriowebapp . + + - name: Run Container + run: docker run -p 80:80 --name container1 jarrettgaither/liatriowebapp + - name: run tests uses: liatrio/github-actions/apprentice-action@master + + - name: Stop Container + run: docker stop container1 From e505756e7eb4baeaa96208190ed6071b3b2eeccf Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:38:09 -0700 Subject: [PATCH 2/7] Update main.yml --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b15e8ca..9601411 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,12 +12,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{secrets.jarrettgaither}} - password: ${{secrets.Aceofspades45?}} - - name: Build Image run: docker build -t jarrettgaither/liatriowebapp . From e795f4dc3e260836c47ba57f07072cf7871547fc Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:19:37 -0700 Subject: [PATCH 3/7] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9601411..1c30772 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,9 @@ jobs: - name: Run Container run: docker run -p 80:80 --name container1 jarrettgaither/liatriowebapp + + - name: Wait for start + run: sleep 5s - name: run tests uses: liatrio/github-actions/apprentice-action@master From c3628d51aafa03332e8fc20c1c306f543e725253 Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:24:05 -0700 Subject: [PATCH 4/7] Update main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c30772..bb587b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,10 @@ jobs: - name: Run Container run: docker run -p 80:80 --name container1 jarrettgaither/liatriowebapp - + while [ "$(docker inspect -f '{{.State.Status}}' container1)" != "running" ]; do + sleep 1 + done + - name: Wait for start run: sleep 5s From 5f427eb8cd65db2220c5cff4eb3908fc11e7c350 Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:42:09 -0700 Subject: [PATCH 5/7] Update main.yml --- .github/workflows/main.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb587b3..be65bb2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,18 +14,13 @@ jobs: - name: Build Image run: docker build -t jarrettgaither/liatriowebapp . + container-tester: + runs-on: ubuntu-latest + container: + image: jarrettgaither/liatriowebapp + steps: + - name: run tests + uses: liatrio/github-actions/apprentice-action@master - - name: Run Container - run: docker run -p 80:80 --name container1 jarrettgaither/liatriowebapp - while [ "$(docker inspect -f '{{.State.Status}}' container1)" != "running" ]; do - sleep 1 - done - - - name: Wait for start - run: sleep 5s - - - name: run tests - uses: liatrio/github-actions/apprentice-action@master - - - name: Stop Container - run: docker stop container1 + - name: Stop Container + run: docker stop container1 From 2ad70baf93a4f7c5cc3077933bca47ee287d7286 Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:56:46 -0700 Subject: [PATCH 6/7] Update main.yml --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be65bb2..24b35d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,13 +14,13 @@ jobs: - name: Build Image run: docker build -t jarrettgaither/liatriowebapp . - container-tester: - runs-on: ubuntu-latest - container: - image: jarrettgaither/liatriowebapp - steps: - - name: run tests - uses: liatrio/github-actions/apprentice-action@master - - name: Stop Container - run: docker stop container1 + - name: Run Container + run: docker run -p 80:80 --name container1 jarrettgaither/liatriowebapp + kill + + - name: run tests + uses: liatrio/github-actions/apprentice-action@master + + - name: Stop Container + run: docker stop container1 From 1ab46cd7dcce43c7f6ca53d7996115815953c210 Mon Sep 17 00:00:00 2001 From: jarrettgaither <167137591+jarrettgaither@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:19:32 -0700 Subject: [PATCH 7/7] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24b35d1..9be31a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,8 +16,7 @@ jobs: run: docker build -t jarrettgaither/liatriowebapp . - name: Run Container - run: docker run -p 80:80 --name container1 jarrettgaither/liatriowebapp - kill + run: docker run -d -p 80:80 --name container1 jarrettgaither/liatriowebapp - name: run tests uses: liatrio/github-actions/apprentice-action@master