From f944d6eaf7c0e4ab56ec009630af976305edbbb9 Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Sat, 6 Nov 2021 00:32:56 +0530 Subject: [PATCH 1/7] Create docker-pub.yml --- .github/workflows/docker-pub.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-pub.yml diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-pub.yml new file mode 100644 index 00000000000..82f4ec76d48 --- /dev/null +++ b/.github/workflows/docker-pub.yml @@ -0,0 +1,18 @@ +name: Docker pub + +on: + push: [ main ] + workflow_dispatch: + # Run tests for any PRs. + pull_request: + +env: + # Image name used while building docker image + IMAGE_NAME: sysds + +jobs: + # Run tests. + # See also https://docs.docker.com/docker-hub/builds/automated-testing/ + test: + runs-on: ubuntu-latest + From 10c2707e0beb9e932a5b1a873042fefae3f39b4b Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Sat, 6 Nov 2021 00:36:16 +0530 Subject: [PATCH 2/7] correct syntax --- .github/workflows/docker-pub.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-pub.yml index 82f4ec76d48..9c9584a8b2d 100644 --- a/.github/workflows/docker-pub.yml +++ b/.github/workflows/docker-pub.yml @@ -1,10 +1,12 @@ name: Docker pub on: - push: [ main ] + push: + branches: main workflow_dispatch: # Run tests for any PRs. pull_request: + branches: main env: # Image name used while building docker image @@ -13,6 +15,6 @@ env: jobs: # Run tests. # See also https://docs.docker.com/docker-hub/builds/automated-testing/ - test: + test-job: runs-on: ubuntu-latest From ab905d6d6f00a6caa7df98b74c01e143ff3be0c3 Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Sat, 6 Nov 2021 00:46:24 +0530 Subject: [PATCH 3/7] add run commands --- .github/workflows/docker-pub.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-pub.yml index 9c9584a8b2d..cd53feabfb3 100644 --- a/.github/workflows/docker-pub.yml +++ b/.github/workflows/docker-pub.yml @@ -18,3 +18,11 @@ jobs: test-job: runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Build image + run: ./docker/build.sh + + + From 4e3924f22425182359655193bcc757b22db1da42 Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Sat, 6 Nov 2021 01:24:31 +0530 Subject: [PATCH 4/7] add only testsysds docker image --- .github/workflows/docker-pub.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-pub.yml index cd53feabfb3..c65367f27c2 100644 --- a/.github/workflows/docker-pub.yml +++ b/.github/workflows/docker-pub.yml @@ -22,7 +22,8 @@ jobs: - uses: actions/checkout@v2 - name: Build image - run: ./docker/build.sh + run: docker image build -f docker/testsysds.Dockerfile -t apache/systemds:testing-latest . + From 532568b1491f36ced7f6a230ea79983fcf72c164 Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Wed, 24 Nov 2021 21:47:05 +0530 Subject: [PATCH 5/7] add publish action --- .github/workflows/docker-pub.yml | 54 +++++++++++++++++++++----------- docker/sysds.Dockerfile | 6 ++-- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-pub.yml index c65367f27c2..78aea155bfb 100644 --- a/.github/workflows/docker-pub.yml +++ b/.github/workflows/docker-pub.yml @@ -1,29 +1,45 @@ -name: Docker pub +name: Docker Image CI and CD on: - push: - branches: main - workflow_dispatch: - # Run tests for any PRs. + push: + branches: [ main ] pull_request: - branches: main - -env: - # Image name used while building docker image - IMAGE_NAME: sysds + branches: [ main ] + workflow_dispatch: jobs: - # Run tests. - # See also https://docs.docker.com/docker-hub/builds/automated-testing/ - test-job: + + build: + runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Build image - run: docker image build -f docker/testsysds.Dockerfile -t apache/systemds:testing-latest . + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + with: + platforms: all + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + context: ./docker + file: ./docker/sysds.Dockerfile + push: true + # tags: apache/systemds:latest + tags: return01/test-ghactions-systemds:latest + \ No newline at end of file diff --git a/docker/sysds.Dockerfile b/docker/sysds.Dockerfile index c1c71d3c835..e922ea0eaea 100644 --- a/docker/sysds.Dockerfile +++ b/docker/sysds.Dockerfile @@ -60,7 +60,7 @@ RUN apt-get update -qq \ rm -r target/hadoop-test && \ rm -r target/maven-archiver && \ rm -r target/systemds-** && \ - rm -r docker && \ + # rm -r docker && \ rm -r docs && \ rm -r src && \ rm -r /usr/lib/mvn && \ @@ -68,6 +68,8 @@ RUN apt-get update -qq \ rm -r pom.xml && \ rm -r ~/.m2 -COPY docker/mountFolder/main.dml /input/main.dml +RUN mkdir /input && echo 'print("Hello from SystemDS")' > /input/main.dml + +# COPY docker/mountFolder/main.dml /input/main.dml CMD ["systemds", "/input/main.dml"] From 0cc9187fcdd59b1b3cfeda592b5f47cc20c2eb91 Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Sat, 8 Jan 2022 22:14:32 +0530 Subject: [PATCH 6/7] fix issues with file context --- .github/workflows/docker-pub.yml | 32 ++++++++++++++++++++------------ docker/sysds.Dockerfile | 4 +--- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-pub.yml index 78aea155bfb..35a1fd34761 100644 --- a/.github/workflows/docker-pub.yml +++ b/.github/workflows/docker-pub.yml @@ -10,36 +10,44 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - with: - platforms: all + # https://github.com/docker/setup-buildx-action - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 - + +## Uncomment the following to inspect buildx build +# +# - name: Inspect builder +# run: | +# echo "Name: ${{ steps.buildx.outputs.name }}" +# echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" +# echo "Status: ${{ steps.buildx.outputs.status }}" +# echo "Flags: ${{ steps.buildx.outputs.flags }}" +# echo "Platforms: ${{ steps.buildx.outputs.platforms }}" + + # IMPORTANT: The credentials should not be available via the + # Pull request, hence this if condition here. + # github.event_name != 'pull_request' - name: Login to DockerHub - if: github.event_name != 'pull_request' +# if: github.event_name != 'pull_request' uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} + # https://github.com/docker/build-push-action - name: Build and push id: docker_build uses: docker/build-push-action@v2 with: - context: ./docker + context: . file: ./docker/sysds.Dockerfile push: true - # tags: apache/systemds:latest - tags: return01/test-ghactions-systemds:latest - \ No newline at end of file + tags: apache/systemds:nightly + diff --git a/docker/sysds.Dockerfile b/docker/sysds.Dockerfile index e922ea0eaea..c443d57912f 100644 --- a/docker/sysds.Dockerfile +++ b/docker/sysds.Dockerfile @@ -60,7 +60,6 @@ RUN apt-get update -qq \ rm -r target/hadoop-test && \ rm -r target/maven-archiver && \ rm -r target/systemds-** && \ - # rm -r docker && \ rm -r docs && \ rm -r src && \ rm -r /usr/lib/mvn && \ @@ -68,8 +67,7 @@ RUN apt-get update -qq \ rm -r pom.xml && \ rm -r ~/.m2 -RUN mkdir /input && echo 'print("Hello from SystemDS")' > /input/main.dml -# COPY docker/mountFolder/main.dml /input/main.dml +COPY docker/mountFolder/main.dml /input/main.dml CMD ["systemds", "/input/main.dml"] From e3dd67459bdcf0d3cd0a04b6265c556e54836168 Mon Sep 17 00:00:00 2001 From: Janardhan Pulivarthi Date: Sat, 8 Jan 2022 22:18:39 +0530 Subject: [PATCH 7/7] Rename docker-pub.yml to docker-cd.yml --- .github/workflows/{docker-pub.yml => docker-cd.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker-pub.yml => docker-cd.yml} (100%) diff --git a/.github/workflows/docker-pub.yml b/.github/workflows/docker-cd.yml similarity index 100% rename from .github/workflows/docker-pub.yml rename to .github/workflows/docker-cd.yml