From 3f66d86f342430c440cc70bdc4d766ad857302f4 Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:03:42 +0100 Subject: [PATCH 1/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0e95f6f..769ba4a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,7 +4,7 @@ on: push: branches: [ "master" ] pull_request: - branches: [ "master" ] + branches: [ "master" ] jobs: @@ -26,7 +26,7 @@ jobs: needs: build - runs-on: self-hosted + runs-on: ubuntu-latest steps: - name: Docker stop From f203a90dcb2c5c56d7942af16c315de9bdbe015e Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:10:42 +0100 Subject: [PATCH 2/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 769ba4a..ab5bb3e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v3 - name: Docker login - run: docker login docker.dariusklein.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }} + run: docker login 192.168.1.200:3000 - name: Build the Docker image - run: docker build . --tag docker.dariusklein.nl/klein-server-docs + run: docker build . --tag 192.168.1.200/klein-project/KleinDocs - name: Docker push - run: docker push docker.dariusklein.nl/klein-server-docs + run: docker push 192.168.1.200/klein-project/KleinDocs publish: From 6b9aa5134a2b6d1f8449d13fb01a0a94799daea9 Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:16:40 +0100 Subject: [PATCH 3/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ab5bb3e..bffdbe1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v3 - name: Docker login - run: docker login 192.168.1.200:3000 + run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} -u ${{secrets.docker_username}} - name: Build the Docker image - run: docker build . --tag 192.168.1.200/klein-project/KleinDocs + run: docker build . --tag 192.168.1.200/klein-project/KleinDocs:latest - name: Docker push - run: docker push 192.168.1.200/klein-project/KleinDocs + run: docker push 192.168.1.200/klein-project/KleinDocs:latest publish: @@ -32,8 +32,8 @@ jobs: - name: Docker stop run: docker stop KleinDocs || true - name: Docker login - run: docker login docker.dariusklein.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }} + run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} - name: Docker pull - run: docker pull docker.dariusklein.nl/klein-server-docs + run: docker pull 192.168.1.200/klein-project/KleinDocs:latest - name: Docker run - run: docker run --rm -dit -p 9092:80 --name KleinDocs docker.dariusklein.nl/klein-server-docs + run: docker run --rm -dit -p 9092:80 --name KleinDocs 192.168.1.200/klein-project/KleinDocs:latest From 1e9bde8bc7a43f01079fbd0e06a1a27ac3d91c90 Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:23:39 +0100 Subject: [PATCH 4/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index bffdbe1..4d3bc5a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,9 +17,9 @@ jobs: - name: Docker login run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} -u ${{secrets.docker_username}} - name: Build the Docker image - run: docker build . --tag 192.168.1.200/klein-project/KleinDocs:latest + run: docker build . --tag 192.168.1.200/klein-project/klein-docs:latest - name: Docker push - run: docker push 192.168.1.200/klein-project/KleinDocs:latest + run: docker push 192.168.1.200/klein-project/klein-docs:latest publish: @@ -30,10 +30,10 @@ jobs: steps: - name: Docker stop - run: docker stop KleinDocs || true + run: docker stop infrastructure-kleinserver-klein-docs || true - name: Docker login run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} - name: Docker pull - run: docker pull 192.168.1.200/klein-project/KleinDocs:latest + run: docker pull 192.168.1.200/klein-project/klein-docs:latest - name: Docker run - run: docker run --rm -dit -p 9092:80 --name KleinDocs 192.168.1.200/klein-project/KleinDocs:latest + run: docker run --rm -dit -p 9092:80 --name infrastructure-kleinserver-klein-docs 192.168.1.200/klein-project/klein-docs:latest From 505845cd62e2ff56396d740e7b79dd8efb55cb3c Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:35:25 +0100 Subject: [PATCH 5/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4d3bc5a..f74b5d5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,9 +17,9 @@ jobs: - name: Docker login run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} -u ${{secrets.docker_username}} - name: Build the Docker image - run: docker build . --tag 192.168.1.200/klein-project/klein-docs:latest + run: docker build . --tag 192.168.1.200/klein-projects/klein-docs:latest - name: Docker push - run: docker push 192.168.1.200/klein-project/klein-docs:latest + run: docker push 192.168.1.200/klein-projects/klein-docs:latest publish: @@ -34,6 +34,6 @@ jobs: - name: Docker login run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} - name: Docker pull - run: docker pull 192.168.1.200/klein-project/klein-docs:latest + run: docker pull 192.168.1.200/klein-projects/klein-docs:latest - name: Docker run - run: docker run --rm -dit -p 9092:80 --name infrastructure-kleinserver-klein-docs 192.168.1.200/klein-project/klein-docs:latest + run: docker run --rm -dit -p 9092:80 --name infrastructure-kleinserver-klein-docs 192.168.1.200/klein-projects/klein-docs:latest From 501921470ab0b6afd3eed82ba696b4231c78c143 Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:37:44 +0100 Subject: [PATCH 6/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f74b5d5..efbb11d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,9 +17,9 @@ jobs: - name: Docker login run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} -u ${{secrets.docker_username}} - name: Build the Docker image - run: docker build . --tag 192.168.1.200/klein-projects/klein-docs:latest + run: docker build . --tag 192.168.1.200:3000/klein-projects/klein-docs:latest - name: Docker push - run: docker push 192.168.1.200/klein-projects/klein-docs:latest + run: docker push 192.168.1.200/klein-projects:3000/klein-docs:latest publish: @@ -34,6 +34,6 @@ jobs: - name: Docker login run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} - name: Docker pull - run: docker pull 192.168.1.200/klein-projects/klein-docs:latest + run: docker pull 192.168.1.200:3000/klein-projects/klein-docs:latest - name: Docker run - run: docker run --rm -dit -p 9092:80 --name infrastructure-kleinserver-klein-docs 192.168.1.200/klein-projects/klein-docs:latest + run: docker run --rm -dit -p 9092:80 --name infrastructure-kleinserver-klein-docs 192.168.1.200:3000/klein-projects/klein-docs:latest From ec7d31948acab65994edb2ebd9c3ac5f7f3dfc75 Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:38:48 +0100 Subject: [PATCH 7/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index efbb11d..cf8293d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -19,7 +19,7 @@ jobs: - name: Build the Docker image run: docker build . --tag 192.168.1.200:3000/klein-projects/klein-docs:latest - name: Docker push - run: docker push 192.168.1.200/klein-projects:3000/klein-docs:latest + run: docker push 192.168.1.200:3000/klein-projects/klein-docs:latest publish: From 3cfef1c0480cd85fe5169241e9fcd605153c4d54 Mon Sep 17 00:00:00 2001 From: Rudi klein Date: Sat, 11 Jan 2025 13:41:10 +0100 Subject: [PATCH 8/8] Update .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index cf8293d..f87de80 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -32,7 +32,7 @@ jobs: - name: Docker stop run: docker stop infrastructure-kleinserver-klein-docs || true - name: Docker login - run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} + run: docker login 192.168.1.200:3000 -p ${{secrets.docker_password}} -u ${{secrets.docker_username}} - name: Docker pull run: docker pull 192.168.1.200:3000/klein-projects/klein-docs:latest - name: Docker run