From 3cf035c1b586d1e3437ed9a368f66114d043ad4d Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 15 Apr 2022 12:20:31 -0400 Subject: [PATCH 1/5] ci-cd to publish windows porter fix image --- .github/workflows/porter-windows-cd.yml | 27 +++++++++++++++++++++++++ .github/workflows/porter-windows-ci.yml | 18 +++++++++++++++++ Dockerfile.porter-windows | 10 +++++++++ 3 files changed, 55 insertions(+) create mode 100644 .github/workflows/porter-windows-cd.yml create mode 100644 .github/workflows/porter-windows-ci.yml create mode 100644 Dockerfile.porter-windows diff --git a/.github/workflows/porter-windows-cd.yml b/.github/workflows/porter-windows-cd.yml new file mode 100644 index 00000000..fbde5d9f --- /dev/null +++ b/.github/workflows/porter-windows-cd.yml @@ -0,0 +1,27 @@ +name: Porter Invocation Docker Image CD + +on: + push: + branches: [ master, windows-porter-install-fix ] + workflow_dispatch: + +jobs: + docker-cd: + runs-on: ubuntu-latest + steps: + + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} + + - name: Build and push Server Docker image + uses: docker/build-push-action@v2 + with: + context: ./Dockerfile.porter-windows + push: true + tags: codexrems/fullstack_rems-windows:REMSvCurrent \ No newline at end of file diff --git a/.github/workflows/porter-windows-ci.yml b/.github/workflows/porter-windows-ci.yml new file mode 100644 index 00000000..67c69527 --- /dev/null +++ b/.github/workflows/porter-windows-ci.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + pull_request: + branches: [ master, dev ] + workflow_dispatch: + + +jobs: + docker-ci: + runs-on: ubuntu-latest + steps: + + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Test Server Docker image Builds + run: docker build ./Dockerfile.porter-windows \ No newline at end of file diff --git a/Dockerfile.porter-windows b/Dockerfile.porter-windows new file mode 100644 index 00000000..b7c5b532 --- /dev/null +++ b/Dockerfile.porter-windows @@ -0,0 +1,10 @@ +FROM ubuntu:latest +WORKDIR /porter +RUN apt update +RUN apt -y install curl +RUN curl -fsSL https://get.docker.com -o get-docker.sh +RUN chmod u+x get-docker.sh +RUN ./get-docker.sh +RUN curl -L https://cdn.porter.sh/latest/install-linux.sh | bash +RUN export PATH="$PATH:~/.porter" +ENV PATH="$PATH:~/.porter" From aa465b738e99061fa40632605889253fa7c43e32 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 15 Apr 2022 12:46:29 -0400 Subject: [PATCH 2/5] fix ci-cd --- .github/workflows/porter-windows-cd.yml | 4 ++-- .github/workflows/porter-windows-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/porter-windows-cd.yml b/.github/workflows/porter-windows-cd.yml index fbde5d9f..a9cddf09 100644 --- a/.github/workflows/porter-windows-cd.yml +++ b/.github/workflows/porter-windows-cd.yml @@ -1,4 +1,4 @@ -name: Porter Invocation Docker Image CD +name: Porter Windows Docker Image CD on: push: @@ -22,6 +22,6 @@ jobs: - name: Build and push Server Docker image uses: docker/build-push-action@v2 with: - context: ./Dockerfile.porter-windows + context: Dockerfile.porter-windows push: true tags: codexrems/fullstack_rems-windows:REMSvCurrent \ No newline at end of file diff --git a/.github/workflows/porter-windows-ci.yml b/.github/workflows/porter-windows-ci.yml index 67c69527..336c208d 100644 --- a/.github/workflows/porter-windows-ci.yml +++ b/.github/workflows/porter-windows-ci.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: Porter Windows Docker Image CI on: pull_request: @@ -15,4 +15,4 @@ jobs: uses: actions/checkout@v2 - name: Test Server Docker image Builds - run: docker build ./Dockerfile.porter-windows \ No newline at end of file + run: docker build Dockerfile.porter-windows \ No newline at end of file From 488812fa0f7dc6a38f281d89713e043bb29829c9 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 15 Apr 2022 12:50:52 -0400 Subject: [PATCH 3/5] ci-cd fix update 2 --- .github/workflows/porter-windows-cd.yml | 3 ++- .github/workflows/porter-windows-ci.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/porter-windows-cd.yml b/.github/workflows/porter-windows-cd.yml index a9cddf09..e0110fb2 100644 --- a/.github/workflows/porter-windows-cd.yml +++ b/.github/workflows/porter-windows-cd.yml @@ -22,6 +22,7 @@ jobs: - name: Build and push Server Docker image uses: docker/build-push-action@v2 with: - context: Dockerfile.porter-windows + context: . + file: Dockerfile.porter-windows push: true tags: codexrems/fullstack_rems-windows:REMSvCurrent \ No newline at end of file diff --git a/.github/workflows/porter-windows-ci.yml b/.github/workflows/porter-windows-ci.yml index 336c208d..ffd850e0 100644 --- a/.github/workflows/porter-windows-ci.yml +++ b/.github/workflows/porter-windows-ci.yml @@ -15,4 +15,4 @@ jobs: uses: actions/checkout@v2 - name: Test Server Docker image Builds - run: docker build Dockerfile.porter-windows \ No newline at end of file + run: docker build -f Dockerfile.porter-windows . \ No newline at end of file From e1f4b7802c6de407f0d06ca16ceb4ab77cb96bbb Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 15 Apr 2022 12:53:14 -0400 Subject: [PATCH 4/5] update di-cd description --- .github/workflows/porter-windows-cd.yml | 2 +- .github/workflows/porter-windows-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/porter-windows-cd.yml b/.github/workflows/porter-windows-cd.yml index e0110fb2..7ba5a905 100644 --- a/.github/workflows/porter-windows-cd.yml +++ b/.github/workflows/porter-windows-cd.yml @@ -19,7 +19,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - - name: Build and push Server Docker image + - name: Build and push Porter Windows Docker image uses: docker/build-push-action@v2 with: context: . diff --git a/.github/workflows/porter-windows-ci.yml b/.github/workflows/porter-windows-ci.yml index ffd850e0..66f5f1f9 100644 --- a/.github/workflows/porter-windows-ci.yml +++ b/.github/workflows/porter-windows-ci.yml @@ -14,5 +14,5 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 - - name: Test Server Docker image Builds + - name: Test Porter Windows Docker image Builds run: docker build -f Dockerfile.porter-windows . \ No newline at end of file From c7f9d803d0546b4ce32c8165c7b6701d415f916f Mon Sep 17 00:00:00 2001 From: Sahil Malhotra <88040167+smalho01@users.noreply.github.com> Date: Mon, 18 Apr 2022 11:46:05 -0400 Subject: [PATCH 5/5] remove feature branch from cd pipeline --- .github/workflows/porter-windows-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/porter-windows-cd.yml b/.github/workflows/porter-windows-cd.yml index 7ba5a905..033544af 100644 --- a/.github/workflows/porter-windows-cd.yml +++ b/.github/workflows/porter-windows-cd.yml @@ -2,7 +2,7 @@ name: Porter Windows Docker Image CD on: push: - branches: [ master, windows-porter-install-fix ] + branches: [ master ] workflow_dispatch: jobs: @@ -25,4 +25,4 @@ jobs: context: . file: Dockerfile.porter-windows push: true - tags: codexrems/fullstack_rems-windows:REMSvCurrent \ No newline at end of file + tags: codexrems/fullstack_rems-windows:REMSvCurrent