From 104f316e43229b3c4396920516ee927528462096 Mon Sep 17 00:00:00 2001 From: Matthew Horwood Date: Fri, 19 Mar 2021 13:47:41 +0000 Subject: [PATCH 1/3] mho/pipes bug: download pipes --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6215750..9a6ce68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:buster MAINTAINER Werner Beroux @@ -25,6 +25,7 @@ RUN apt-get update \ linuxlogo \ make \ nyancat \ + libncurses6 \ perl \ rig \ sl \ @@ -53,8 +54,10 @@ RUN apt-get update \ && chmod +x /usr/local/bin/falling-hearts \ && echo "Install pipes" \ - && curl -L https://gist.githubusercontent.com/livibetter/4689307/raw/949e43fe2962c2c97c8b1d974ff93dd053d9bd37/pipes.sh -o /usr/local/bin/pipes \ - && chmod +x /usr/local/bin/pipes \ + && curl -L https://github.com/pipeseroni/pipes.sh/archive/v1.3.0.tar.gz -o pipes-v1.3.0.tar.gz \ + && tar -zxvf pipes-v1.3.0.tar.gz \ + && cd pipes.sh-1.3.0 && make install \ + && ln -s /usr/local/bin/pipes.sh /usr/local/bin/pipes \ && echo "Clean-up" \ && apt-get clean \ From ee0fa190228b50a50748a0eaba35e2fc5e291f0d Mon Sep 17 00:00:00 2001 From: Matthew Horwood Date: Fri, 19 Mar 2021 13:53:20 +0000 Subject: [PATCH 2/3] mho/github actions feat: add github actions --- .github/workflows/image-latest.yml | 25 +++++++++++++++++++++++ .github/workflows/image-version.yml | 31 +++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 .github/workflows/image-latest.yml create mode 100644 .github/workflows/image-version.yml diff --git a/.github/workflows/image-latest.yml b/.github/workflows/image-latest.yml new file mode 100644 index 0000000..7891f71 --- /dev/null +++ b/.github/workflows/image-latest.yml @@ -0,0 +1,25 @@ +name: build our image for latest + +on: + push: + branches: master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + - name: install buildx + id: buildx + uses: crazy-max/ghaction-docker-buildx@v3 + with: + version: latest + qemu-version: latest + - name: login to docker hub + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + - name: build the image + run: | + docker buildx build --push \ + --tag mhzawadi/funbox:latest \ + --platform linux/amd64,linux/arm64,linux/arm/v7 . diff --git a/.github/workflows/image-version.yml b/.github/workflows/image-version.yml new file mode 100644 index 0000000..948f04a --- /dev/null +++ b/.github/workflows/image-version.yml @@ -0,0 +1,31 @@ +name: build our image for a tagged version + +on: + push: + tags: + - v* + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + - name: install buildx + id: buildx + uses: crazy-max/ghaction-docker-buildx@v3 + with: + version: latest + qemu-version: latest + - name: Prepare + id: prepare + run: | + VERSION=${GITHUB_REF#refs/tags/v} + echo ::set-output name=version::${VERSION} + - name: login to docker hub + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + - name: build the image + run: | + docker buildx build --push \ + --tag "mhzawadi/phpipam:${{ steps.prepare.outputs.version }}" \ + --platform linux/amd64,linux/arm64 . From 0d90f8d1e5a5ed935400fea088d7d07eadd60996 Mon Sep 17 00:00:00 2001 From: Matthew Horwood Date: Mon, 28 Jun 2021 08:34:30 +0100 Subject: [PATCH 3/3] bug: fix github actions --- .github/workflows/image-latest.yml | 2 +- .github/workflows/image-version.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/image-latest.yml b/.github/workflows/image-latest.yml index 7891f71..22b9047 100644 --- a/.github/workflows/image-latest.yml +++ b/.github/workflows/image-latest.yml @@ -21,5 +21,5 @@ jobs: - name: build the image run: | docker buildx build --push \ - --tag mhzawadi/funbox:latest \ + --tag wernight/docker-funbox:latest \ --platform linux/amd64,linux/arm64,linux/arm/v7 . diff --git a/.github/workflows/image-version.yml b/.github/workflows/image-version.yml index 948f04a..d5109a4 100644 --- a/.github/workflows/image-version.yml +++ b/.github/workflows/image-version.yml @@ -27,5 +27,5 @@ jobs: - name: build the image run: | docker buildx build --push \ - --tag "mhzawadi/phpipam:${{ steps.prepare.outputs.version }}" \ - --platform linux/amd64,linux/arm64 . + --tag wernight/docker-funbox:latest \ + --platform linux/amd64,linux/arm64,linux/arm/v7 .